diff options
| author | infirit <[email protected]> | 2015-09-06 16:20:20 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-09-06 16:20:20 +0200 |
| commit | 9ef7e261d4a9ea536d6f467c2b9bd1381bcd73aa (patch) | |
| tree | e7e9ceb6ea268edfb47c900fd1a427f72059f9bc /applets/fish | |
| parent | 667466775b7d785ac048732b18efacea09711ab2 (diff) | |
| download | mate-panel-9ef7e261d4a9ea536d6f467c2b9bd1381bcd73aa.tar.bz2 mate-panel-9ef7e261d4a9ea536d6f467c2b9bd1381bcd73aa.tar.xz | |
Rework gsettings schema building
* Bump intltool required version for gsettings support
* Extract strings with intltool directly
* Let autoconf generate the xml files
Diffstat (limited to 'applets/fish')
| -rw-r--r-- | applets/fish/Makefile.am | 8 | ||||
| -rw-r--r-- | applets/fish/org.mate.panel.applet.fish.gschema.xml.in | 34 | ||||
| -rw-r--r-- | applets/fish/org.mate.panel.applet.fish.gschema.xml.in.in | 34 |
3 files changed, 37 insertions, 39 deletions
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am index f8688bac..7f63cf5f 100644 --- a/applets/fish/Makefile.am +++ b/applets/fish/Makefile.am @@ -77,13 +77,11 @@ ui_DATA = fish.ui xmluidir = $(datadir)/mate-panel/ui xmlui_DATA = fish-menu.xml -gsettings_SCHEMAS = org.mate.panel.applet.fish.gschema.xml +fish_gschemas_in = org.mate.panel.applet.fish.gschema.xml.in +gsettings_SCHEMAS = $(fish_gschemas_in:.xml.in=.xml) @INTLTOOL_XML_NOMERGE_RULE@ @GSETTINGS_RULES@ -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ - EXTRA_DIST = \ wanda.svg \ $(fishbitmaps_DATA) \ @@ -91,7 +89,7 @@ EXTRA_DIST = \ $(service_in_files) \ $(ui_DATA) \ $(xmlui_DATA) \ - $(gsettings_SCHEMAS).in.in + $(fish_gschemas_in) CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) diff --git a/applets/fish/org.mate.panel.applet.fish.gschema.xml.in b/applets/fish/org.mate.panel.applet.fish.gschema.xml.in new file mode 100644 index 00000000..a3c3fe77 --- /dev/null +++ b/applets/fish/org.mate.panel.applet.fish.gschema.xml.in @@ -0,0 +1,34 @@ +<schemalist gettext-domain="@GETTEXT_PACKAGE@"> + <schema id="org.mate.panel.applet.fish"> + <key name="name" type="s"> + <default>'Wanda'</default> + <summary>The fish's name</summary> + <description>A fish without a name is a pretty dull fish. Bring your fish to life by naming him.</description> + </key> + <key name="image" type="s"> + <default>'wanda.png'</default> + <summary>The fish's animation pixmap</summary> + <description>This key specifies the filename of the pixmap which will be used for the animation displayed in the fish applet relative to the pixmap directory.</description> + </key> + <key name="command" type="s"> + <default>'fortune'</default> + <summary>Command to execute on click</summary> + <description>This key specifies the command that will be tried to execute when the fish is clicked.</description> + </key> + <key name="frames" type="i"> + <default>8</default> + <summary>Frames in fish's animation</summary> + <description>This key specifies the number of frames that will be displayed in the fish's animation.</description> + </key> + <key name="speed" type="d"> + <default>0.3</default> + <summary>Pause per frame</summary> + <description>This key specifies the number of seconds each frame will be displayed.</description> + </key> + <key name="rotate" type="b"> + <default>false</default> + <summary>Rotate on vertical panels</summary> + <description>If true, the fish's animation will be displayed rotated on vertical panels.</description> + </key> + </schema> +</schemalist> diff --git a/applets/fish/org.mate.panel.applet.fish.gschema.xml.in.in b/applets/fish/org.mate.panel.applet.fish.gschema.xml.in.in deleted file mode 100644 index 6ab7bd07..00000000 --- a/applets/fish/org.mate.panel.applet.fish.gschema.xml.in.in +++ /dev/null @@ -1,34 +0,0 @@ -<schemalist gettext-domain="@GETTEXT_PACKAGE@"> - <schema id="org.mate.panel.applet.fish"> - <key name="name" type="s"> - <default>'Wanda'</default> - <_summary>The fish's name</_summary> - <_description>A fish without a name is a pretty dull fish. Bring your fish to life by naming him.</_description> - </key> - <key name="image" type="s"> - <default>'wanda.png'</default> - <_summary>The fish's animation pixmap</_summary> - <_description>This key specifies the filename of the pixmap which will be used for the animation displayed in the fish applet relative to the pixmap directory.</_description> - </key> - <key name="command" type="s"> - <default>'fortune'</default> - <_summary>Command to execute on click</_summary> - <_description>This key specifies the command that will be tried to execute when the fish is clicked.</_description> - </key> - <key name="frames" type="i"> - <default>8</default> - <_summary>Frames in fish's animation</_summary> - <_description>This key specifies the number of frames that will be displayed in the fish's animation.</_description> - </key> - <key name="speed" type="d"> - <default>0.3</default> - <_summary>Pause per frame</_summary> - <_description>This key specifies the number of seconds each frame will be displayed.</_description> - </key> - <key name="rotate" type="b"> - <default>false</default> - <_summary>Rotate on vertical panels</_summary> - <_description>If true, the fish's animation will be displayed rotated on vertical panels.</_description> - </key> - </schema> -</schemalist> |