diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | plugins/filebrowser/Makefile.am | 9 | ||||
| -rw-r--r-- | plugins/filebrowser/org.mate.pluma.plugins.filebrowser.gschema.xml.in | 43 | ||||
| -rw-r--r-- | plugins/filebrowser/org.mate.pluma.plugins.filebrowser.gschema.xml.in.in | 43 | ||||
| -rwxr-xr-x | plugins/time/Makefile.am | 8 | ||||
| -rw-r--r-- | plugins/time/org.mate.pluma.plugins.time.gschema.xml.in (renamed from plugins/time/org.mate.pluma.plugins.time.gschema.xml.in.in) | 6 | ||||
| -rw-r--r-- | po/POTFILES.in | 4 |
7 files changed, 56 insertions, 59 deletions
diff --git a/configure.ac b/configure.ac index 91482659..9f70c1f5 100644 --- a/configure.ac +++ b/configure.ac @@ -387,6 +387,7 @@ plugins/externaltools/Makefile plugins/externaltools/scripts/Makefile plugins/externaltools/tools/Makefile plugins/filebrowser/Makefile +plugins/filebrowser/org.mate.pluma.plugins.filebrowser.gschema.xml plugins/modelines/Makefile plugins/pythonconsole/Makefile plugins/pythonconsole/pythonconsole/Makefile @@ -400,6 +401,7 @@ plugins/sort/Makefile plugins/spell/Makefile plugins/taglist/Makefile plugins/time/Makefile +plugins/time/org.mate.pluma.plugins.time.gschema.xml plugins/trailsave/Makefile po/Makefile.in tests/Makefile diff --git a/plugins/filebrowser/Makefile.am b/plugins/filebrowser/Makefile.am index 2124904c..3b494cdf 100644 --- a/plugins/filebrowser/Makefile.am +++ b/plugins/filebrowser/Makefile.am @@ -66,17 +66,14 @@ pluma-file-browser-marshal.c: pluma-file-browser-marshal.list $(GLIB_GENMARSHAL) plugin_DATA = $(plugin_in_files:.pluma-plugin.desktop.in=.pluma-plugin) @INTLTOOL_XML_NOMERGE_RULE@ -gsettings_SCHEMAS = org.mate.pluma.plugins.filebrowser.gschema.xml +filebrowser_gschema_in = org.mate.pluma.plugins.filebrowser.gschema.xml.in +gsettings_SCHEMAS = $(filebrowser_gschema_in:.xml.in=.xml) @GSETTINGS_RULES@ -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ - - EXTRA_DIST = \ $(ui_DATA) \ $(plugin_in_files) \ - $(gsettings_SCHEMAS).in.in \ + $(filebrowser_gschema_in) \ pluma-file-browser-enum-types.h.template \ pluma-file-browser-enum-types.c.template \ pluma-file-browser-enum-register.c.template \ diff --git a/plugins/filebrowser/org.mate.pluma.plugins.filebrowser.gschema.xml.in b/plugins/filebrowser/org.mate.pluma.plugins.filebrowser.gschema.xml.in new file mode 100644 index 00000000..cf5ada52 --- /dev/null +++ b/plugins/filebrowser/org.mate.pluma.plugins.filebrowser.gschema.xml.in @@ -0,0 +1,43 @@ +<?xml version="1.0"?> +<schemalist> + <schema id="org.mate.pluma.plugins.filebrowser" path="/org/mate/pluma/plugins/filebrowser/"> + <key name="open-at-first-doc" type="b"> + <default>true</default> + <summary>Set Location to First Document</summary> + <description>If TRUE the file browser plugin will view the directory of the first opened document given that the file browser hasn't been used yet. (Thus this generally applies to opening a document from the command line or opening it with Caja, etc.)</description> + </key> + <key name="filter-mode" type="s"> + <default>'hidden_and_binary'</default> + <summary>File Browser Filter Mode</summary> + <description>This value determines what files get filtered from the file browser. Valid values are: none (filter nothing), hidden (filter hidden files), binary (filter binary files) and hidden_and_binary (filter both hidden and binary files).</description> + </key> + <key name="filter-pattern" type="s"> + <default>''</default> + <summary>File Browser Filter Pattern</summary> + <description>The filter pattern to filter the file browser with. This filter works on top of the filter_mode.</description> + </key> + <child name="on-load" schema="org.mate.pluma.plugins.filebrowser.on-load"/> + </schema> + <schema id="org.mate.pluma.plugins.filebrowser.on-load" path="/org/mate/pluma/plugins/filebrowser/on-load/"> + <key name="tree-view" type="b"> + <default>true</default> + <summary>Open With Tree View</summary> + <description>Open the tree view when the file browser plugin gets loaded instead of the bookmarks view</description> + </key> + <key name="root" type="s"> + <default>''</default> + <summary>File Browser Root Directory</summary> + <description>The file browser root directory to use when loading the file browser plugin and onload/tree_view is TRUE.</description> + </key> + <key name="virtual-root" type="s"> + <default>''</default> + <summary>File Browser Virtual Root Directory</summary> + <description>The file browser virtual root directory to use when loading the file browser plugin when onload/tree_view is TRUE. The virtual root must always be below the actual root.</description> + </key> + <key name="enable-remote" type="b"> + <default>false</default> + <summary>Enable Restore of Remote Locations</summary> + <description>Sets whether to enable restoring of remote locations.</description> + </key> + </schema> +</schemalist> diff --git a/plugins/filebrowser/org.mate.pluma.plugins.filebrowser.gschema.xml.in.in b/plugins/filebrowser/org.mate.pluma.plugins.filebrowser.gschema.xml.in.in deleted file mode 100644 index 4b128f97..00000000 --- a/plugins/filebrowser/org.mate.pluma.plugins.filebrowser.gschema.xml.in.in +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0"?> -<schemalist> - <schema id="org.mate.pluma.plugins.filebrowser" path="/org/mate/pluma/plugins/filebrowser/"> - <key name="open-at-first-doc" type="b"> - <default>true</default> - <_summary>Set Location to First Document</_summary> - <_description>If TRUE the file browser plugin will view the directory of the first opened document given that the file browser hasn't been used yet. (Thus this generally applies to opening a document from the command line or opening it with Caja, etc.)</_description> - </key> - <key name="filter-mode" type="s"> - <default>'hidden_and_binary'</default> - <_summary>File Browser Filter Mode</_summary> - <_description>This value determines what files get filtered from the file browser. Valid values are: none (filter nothing), hidden (filter hidden files), binary (filter binary files) and hidden_and_binary (filter both hidden and binary files).</_description> - </key> - <key name="filter-pattern" type="s"> - <default>''</default> - <_summary>File Browser Filter Pattern</_summary> - <_description>The filter pattern to filter the file browser with. This filter works on top of the filter_mode.</_description> - </key> - <child name="on-load" schema="org.mate.pluma.plugins.filebrowser.on-load"/> - </schema> - <schema id="org.mate.pluma.plugins.filebrowser.on-load" path="/org/mate/pluma/plugins/filebrowser/on-load/"> - <key name="tree-view" type="b"> - <default>true</default> - <_summary>Open With Tree View</_summary> - <_description>Open the tree view when the file browser plugin gets loaded instead of the bookmarks view</_description> - </key> - <key name="root" type="s"> - <default>''</default> - <_summary>File Browser Root Directory</_summary> - <_description>The file browser root directory to use when loading the file browser plugin and onload/tree_view is TRUE.</_description> - </key> - <key name="virtual-root" type="s"> - <default>''</default> - <_summary>File Browser Virtual Root Directory</_summary> - <_description>The file browser virtual root directory to use when loading the file browser plugin when onload/tree_view is TRUE. The virtual root must always be below the actual root.</_description> - </key> - <key name="enable-remote" type="b"> - <default>false</default> - <_summary>Enable Restore of Remote Locations</_summary> - <_description>Sets whether to enable restoring of remote locations.</_description> - </key> - </schema> -</schemalist> diff --git a/plugins/time/Makefile.am b/plugins/time/Makefile.am index 0c270b8a..d1f8fe3b 100755 --- a/plugins/time/Makefile.am +++ b/plugins/time/Makefile.am @@ -28,13 +28,11 @@ plugin_in_files = time.pluma-plugin.desktop.in plugin_DATA = $(plugin_in_files:.pluma-plugin.desktop.in=.pluma-plugin) @INTLTOOL_XML_NOMERGE_RULE@ -gsettings_SCHEMAS = org.mate.pluma.plugins.time.gschema.xml +time_gschema_in = org.mate.pluma.plugins.time.gschema.xml.in +gsettings_SCHEMAS = $(time_gschema_in:.xml.in=.xml) @GSETTINGS_RULES@ -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ - -EXTRA_DIST = $(ui_DATA) $(plugin_in_files) $(gsettings_SCHEMAS).in.in +EXTRA_DIST = $(ui_DATA) $(plugin_in_files) $(time_gschema_in) CLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMASn) DISTCLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) diff --git a/plugins/time/org.mate.pluma.plugins.time.gschema.xml.in.in b/plugins/time/org.mate.pluma.plugins.time.gschema.xml.in index d294cfec..b3567e96 100644 --- a/plugins/time/org.mate.pluma.plugins.time.gschema.xml.in.in +++ b/plugins/time/org.mate.pluma.plugins.time.gschema.xml.in @@ -9,15 +9,15 @@ <schema id="org.mate.pluma.plugins.time" path="/org/mate/pluma/plugins/time/"> <key name="prompt-type" enum="org.mate.pluma.plugins.time.PromptType"> <default>'prompt-selected-format'</default> - <_summary>Prompt type</_summary> + <summary>Prompt type</summary> </key> <key name="selected-format" type="s"> <default>'%c'</default> - <_summary>Selected format</_summary> + <summary>Selected format</summary> </key> <key name="custom-format" type="s"> <default>'%d/%m/%Y %H:%M:%S'</default> - <_summary>Custom format</_summary> + <summary>Custom format</summary> </key> </schema> </schemalist> diff --git a/po/POTFILES.in b/po/POTFILES.in index 0bfed6b1..143c2f00 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -64,7 +64,7 @@ plugins/externaltools/data/run-command.desktop.in plugins/externaltools/data/search-recursive.desktop.in plugins/externaltools/data/switch-c.desktop.in plugins/filebrowser/filebrowser.pluma-plugin.desktop.in -plugins/filebrowser/org.mate.pluma.plugins.filebrowser.gschema.xml.in.in +[type: gettext/gsettings]plugins/filebrowser/org.mate.pluma.plugins.filebrowser.gschema.xml.in plugins/filebrowser/pluma-file-bookmarks-store.c plugins/filebrowser/pluma-file-browser-plugin.c plugins/filebrowser/pluma-file-browser-store.c @@ -105,7 +105,7 @@ plugins/taglist/Latex.tags.xml.in plugins/taglist/taglist.pluma-plugin.desktop.in plugins/taglist/XSLT.tags.xml.in plugins/taglist/XUL.tags.xml.in -plugins/time/org.mate.pluma.plugins.time.gschema.xml.in.in +[type: gettext/gsettings]plugins/time/org.mate.pluma.plugins.time.gschema.xml.in plugins/time/pluma-time-plugin.c plugins/time/time.pluma-plugin.desktop.in plugins/trailsave/trailsave.pluma-plugin.desktop.in |