GNOME.org
 

[eog] Use intltool's GSettings support

commit 8f83ae4397bf7a477a154e5712b799fa43c60187
Author: Felix Riemann <friemann gnome org>
Date:   Sun Oct 27 12:55:27 2013 +0100

    Use intltool's GSettings support
    
    Necessary to be able to build the AppData XML in the same folder.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=708757

 configure.ac                         |    4 +-
 data/Makefile.am                     |    8 +-
 data/org.gnome.eog.gschema.xml.in    |  133 ++++++++++++++++++++++++++++++++++
 data/org.gnome.eog.gschema.xml.in.in |  133 ----------------------------------
 po/POTFILES.in                       |    2 +-
 po/POTFILES.skip                     |    1 -
 6 files changed, 140 insertions(+), 141 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1f41b7a..72fef4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,7 @@ fi
 # ***********
 
 AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.40.0])
+IT_PROG_INTLTOOL([0.50.1])
 
 GETTEXT_PACKAGE=AC_PACKAGE_NAME
 AC_SUBST(GETTEXT_PACKAGE)
@@ -344,7 +344,7 @@ po/Makefile.in
 data/Makefile
 data/eog.pc
 data/eog.desktop.in
-data/org.gnome.eog.gschema.xml.in
+data/org.gnome.eog.gschema.xml
 data/pixmaps/Makefile
 data/icons/Makefile
 data/icons/16x16/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 5982c7f..1191ae9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,17 +8,16 @@ DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in.in=.desktop)
 desktopdir = $(datadir)/applications
 desktop_DATA = $(DESKTOP_FILES)
 
- INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE@
 appdatadir = $(datadir)/appdata
-dist_appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 appdata_in_files = eog.appdata.xml.in
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 gsettings_ENUM_NAMESPACE = org.gnome.eog
 gsettings_ENUM_FILES = $(top_srcdir)/src/eog-scroll-view.h     \
                        $(top_srcdir)/src/eog-window.h
 gsettings_SCHEMAS = org.gnome.eog.gschema.xml
 
- INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 gsettingsconvertdir = $(datadir)/GConf/gsettings
@@ -42,10 +41,11 @@ EXTRA_DIST =                        \
         $(style_DATA)          \
         $(ui_DATA)             \
         $(DESKTOP_IN_FILES)    \
+       $(appdata_in_files)     \
        eog.convert
 
 CLEANFILES =                   \
-       eog.appdata.xml
+       $(appdata_DATA)
 
 DISTCLEANFILES =               \
         $(DESKTOP_FILES)        \
diff --git a/data/org.gnome.eog.gschema.xml.in b/data/org.gnome.eog.gschema.xml.in
new file mode 100644
index 0000000..f7b96bd
--- /dev/null
+++ b/data/org.gnome.eog.gschema.xml.in
@@ -0,0 +1,133 @@
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.eog" path="/org/gnome/eog/">
+    <child name="view" schema="org.gnome.eog.view"/>
+    <child name="fullscreen" schema="org.gnome.eog.fullscreen"/>
+    <child name="ui" schema="org.gnome.eog.ui"/>
+    <child name="plugins" schema="org.gnome.eog.plugins"/>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.eog.view" path="/org/gnome/eog/view/">
+    <key name="autorotate" type="b">
+      <default>true</default>
+      <summary>Automatic orientation</summary>
+      <description>Whether the image should be rotated automatically based on EXIF orientation.</description>
+    </key>
+    <key name="background-color" type="s">
+       <default>'#000000'</default>
+       <summary>Background Color</summary>
+       <description>The color that is used to fill the area behind the image. If the use-background-color 
key is not set, the color is determined by the active GTK+ theme instead.</description>
+    </key>
+    <key name="interpolate" type="b">
+      <default>true</default>
+      <summary>Interpolate Image</summary>
+      <description>Whether the image should be interpolated on zoom-out. This leads to better quality but is 
somewhat slower than non-interpolated images.</description>
+    </key>
+    <key name="extrapolate" type="b">
+      <default>true</default>
+      <summary>Extrapolate Image</summary>
+      <description>Whether the image should be extrapolated on zoom-in. This leads to blurry quality and is 
somewhat slower than non-extrapolated images.</description>
+    </key>
+    <key name="transparency" enum="org.gnome.eog.EogTransparencyStyle">
+      <default>'checked'</default>
+      <summary>Transparency indicator</summary>
+      <description>Determines how transparency should be indicated. Valid values are CHECK_PATTERN, COLOR 
and NONE. If COLOR is chosen, then the trans-color key determines the color value used.</description>
+    </key>
+    <key name="scroll-wheel-zoom" type="b">
+      <default>true</default>
+      <summary>Scroll wheel zoom</summary>
+      <description>Whether the scroll wheel should be used for zooming.</description>
+    </key>
+    <key name="zoom-multiplier" type="d">
+      <default>0.05</default>
+      <summary>Zoom multiplier</summary>
+      <description>The multiplier to be applied when using the mouse scroll wheel  for zooming. This value 
defines the zooming step used for each scroll  event. For example, 0.05 results in a 5% zoom increment for 
each  scroll event and 1.00 result in a 100% zoom increment.</description>
+    </key>
+    <key name="trans-color" type="s">
+      <default>'#000000'</default>
+      <summary>Transparency color</summary>
+      <description>If the transparency key has the value COLOR, then this  key determines the color which is 
used for indicating transparency.</description>
+    </key>
+    <key name="use-background-color" type="b">
+       <default>true</default>
+       <summary>Use a custom background color</summary>
+       <description>If this is active, the color set by the background-color key will be used to fill the 
area behind the image. If it is not set, the current GTK+ theme will determine the fill color.</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.eog.fullscreen" path="/org/gnome/eog/fullscreen/">
+    <key name="loop" type="b">
+      <default>true</default>
+      <summary>Loop through the image sequence</summary>
+      <description>Whether the sequence of images should be shown in an endless loop.</description>
+    </key>
+    <key name="upscale" type="b">
+      <default>true</default>
+      <summary>Allow zoom greater than 100% initially</summary>
+      <description>If this is set to FALSE small images will not be stretched to fit into the screen 
initially.</description>
+    </key>
+    <key name="seconds" type="i">
+      <default>5</default>
+      <summary>Delay in seconds until showing the next image</summary>
+      <description>A value greater than 0 determines the seconds an image stays on screen until the next one 
is shown automatically. Zero  disables the automatic browsing.</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.eog.ui" path="/org/gnome/eog/ui/">
+    <key name="toolbar" type="b">
+      <default>true</default>
+      <summary>Show/Hide the window toolbar.</summary>
+    </key>
+    <key name="statusbar" type="b">
+      <default>true</default>
+      <summary>Show/Hide the window statusbar.</summary>
+    </key>
+    <key name="image-gallery" type="b">
+      <default>false</default>
+      <summary>Show/Hide the image gallery pane.</summary>
+    </key>
+    <key name="image-gallery-position" enum="org.gnome.eog.EogWindowGalleryPos">
+      <default>'bottom'</default>
+      <summary>Image gallery pane position. Set to 0 for bottom;  1 for left; 2 for top; 3 for 
right.</summary>
+    </key>
+    <key name="image-gallery-resizable" type="b">
+      <default>false</default>
+      <summary>Whether the image gallery pane should be resizable.</summary>
+    </key>
+    <key name="sidebar" type="b">
+      <default>true</default>
+      <summary>Show/Hide the window side pane.</summary>
+    </key>
+    <key name="scroll-buttons" type="b">
+      <default>true</default>
+      <summary>Show/Hide the image gallery pane scroll buttons.</summary>
+    </key>
+    <key name="disable-close-confirmation" type="b">
+       <default>false</default>
+       <summary>Close main window without asking to save changes.</summary>
+    </key>
+    <key name="disable-trash-confirmation" type="b">
+      <default>false</default>
+      <summary>Trash images without asking</summary>
+      <description>If activated, Eye of GNOME won't ask for confirmation when moving images to the trash. It 
will still ask if any of the files cannot be moved to the trash and would be deleted instead.</description>
+    </key>
+    <key name="filechooser-xdg-fallback" type="b">
+      <default>true</default>
+      <summary>Whether the file chooser should show the user's pictures folder if no images are 
loaded.</summary>
+      <description>If activated and no image is loaded in the active window, the file chooser will display 
the user's pictures folder using the XDG special user directories. If deactivated or the pictures folder has 
not been set up, it will show the current working directory.</description>
+    </key>
+    <key name="propsdialog-netbook-mode" type="b">
+      <default>true</default>
+      <summary>Whether the metadata list in the properties dialog should have its own page.</summary>
+      <description>If activated, the detailed metadata list in the properties dialog will be moved to its 
own page in the dialog. This should make the dialog more usable on smaller screens, e.g. as used by netbooks. 
If disabled, the widget will be embedded on the "Metadata" page.</description>
+    </key>
+    <key name="external-editor" type="s">
+      <default>''</default>
+      <summary>External program to use for editing images</summary>
+      <description>The desktop file name (including the ".desktop") of the application to use for editing 
images (when the "Edit Image" toolbar button is clicked). Set to the empty string to disable this 
feature.</description>
+    </key>
+  </schema>
+  <schema id="org.gnome.eog.plugins" path="/org/gnome/eog/plugins/">
+    <key name="active-plugins" type="as">
+      <default>['fullscreen']</default>
+      <summary>Active plugins</summary>
+      <description>List of active plugins. It doesn't contain the "Location" of the active plugins.  See the 
.eog-plugin file for obtaining the "Location" of a given plugin.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c9083b1..33294f3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,7 +9,7 @@ data/eog.desktop.in.in
 [type: gettext/glade]data/eog-image-properties-dialog.ui
 [type: gettext/glade]data/eog-multiple-save-as-dialog.ui
 [type: gettext/glade]data/eog-preferences-dialog.ui
-data/org.gnome.eog.gschema.xml.in.in
+[type: gettext/gsettings]data/org.gnome.eog.gschema.xml.in
 plugins/fullscreen/eog-fullscreen-plugin.c
 plugins/fullscreen/fullscreen.plugin.desktop.in
 plugins/reload/eog-reload-plugin.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 39a439e..3a36ee6 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,4 +1,3 @@
 # List of source files that should *not* be translated.
 # Please keep this file sorted alphabetically.
 data/eog.desktop.in
-data/org.gnome.eog.gschema.xml.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]