Rework gsettings schema building

* Bump intltool required version for gsettings support * Extract strings with intltool directly * Let autoconf generate the xml files
author: infirit <[email protected]> 2015-09-06 21:55:35 +0200
committer: infirit <[email protected]> 2015-09-06 21:55:35 +0200
commit: df7a7488950139e3884972e2363294051e33d45d (patch)
tree: c442d94aba98b29a69a743701bf9a7d7a1086950 /stickynotes
parent: 6bfc67fc80ba929a740d20edd9ba34927dfefafe (diff)
download: mate-applets-df7a7488950139e3884972e2363294051e33d45d.tar.bz2
mate-applets-df7a7488950139e3884972e2363294051e33d45d.tar.xz
3 files changed, 73 insertions, 75 deletions
diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am
index 2b10fd29..27950c76 100644
--- a/stickynotes/Makefile.am
+++ b/stickynotes/Makefile.am
@@ -48,12 +48,10 @@ uidir = $(datadir)/mate/ui
 ui_DATA = $(ui_files)
 
 @INTLTOOL_XML_NOMERGE_RULE@
-gsettings_SCHEMAS = org.mate.stickynotes.gschema.xml
+stickynotes_gschema_in_files = org.mate.stickynotes.gschema.xml.in
+gsettings_SCHEMAS = $(stickynotes_gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
- $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
 convertdir = $(datadir)/MateConf/gsettings
 convert_DATA = stickynotes-applet.convert
 
@@ -76,14 +74,14 @@ org.mate.panel.applet.StickyNotesAppletFactory.service: $(service_in_files)
 -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
 $< > $@
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) *.gschema.valid
+CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
 
 endif
 
 EXTRA_DIST = \
 $(builder_files) \
 $(ui_files) \
- $(gsettings_SCHEMAS).in.in \
+ $(stickynotes_gschema_in_files) \
 $(convert_DATA) \
 $(service_in_files) \
 org.mate.applets.StickyNotesApplet.mate-panel-applet.in.in
diff --git a/stickynotes/org.mate.stickynotes.gschema.xml.in b/stickynotes/org.mate.stickynotes.gschema.xml.in
new file mode 100644
index 00000000..eb5d3927
--- /dev/null
+++ b/stickynotes/org.mate.stickynotes.gschema.xml.in
@@ -0,0 +1,69 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+ <schema id="org.mate.stickynotes" path="/org/mate/stickynotes/">
+ <key name="default-width" type="i">
+ <default>100</default>
+ <summary>Default width for new notes</summary>
+ <description>Default width for new sticky notes in pixels.</description>
+ </key>
+ <key name="default-height" type="i">
+ <default>100</default>
+ <summary>Default height for new notes</summary>
+ <description>Default height for new sticky notes in pixels.</description>
+ </key>
+ <key name="default-color" type="s">
+ <default>'#ECF833'</default>
+ <summary>Default color for new notes</summary>
+ <description>Default color for new sticky notes. This should be in html hex specification, for example "#30FF50".</description>
+ </key>
+ <key name="default-font-color" type="s">
+ <default>'#000000'</default>
+ <summary>Default color for font</summary>
+ <description>Default font color for new sticky notes. This should be in html hex specification, for example "#000000".</description>
+ </key>
+ <key name="default-font" type="s">
+ <default>'Sans 10'</default>
+ <summary>Default font for new notes</summary>
+ <description>Default font for new sticky notes. This should be a Pango Font Name, for example "Sans Italic 10".</description>
+ </key>
+ <key name="sticky" type="b">
+ <default>true</default>
+ <summary>Sticky notes' workspace stickyness</summary>
+ <description>Specifies whether the sticky notes are visible on ALL workspaces on the desktop, or not.</description>
+ </key>
+ <key name="locked" type="b">
+ <default>false</default>
+ <summary>Sticky notes' locked state</summary>
+ <description>Specifies whether the sticky notes are locked (non-editable) or not.</description>
+ </key>
+ <key name="date-format" type="s">
+ <default>'%x'</default>
+ <summary>Date format of note's title</summary>
+ <description>By default, sticky notes are given the current date as the title when they are created. This format is used; anything that can be parsed by strftime() is valid.</description>
+ </key>
+ <key name="use-system-color" type="b">
+ <default>true</default>
+ <summary>Whether to use the default system color</summary>
+ <description>If this option is disabled, a custom color can be used as the default color for all sticky notes.</description>
+ </key>
+ <key name="use-system-font" type="b">
+ <default>true</default>
+ <summary>Whether to use the default system font</summary>
+ <description>If this option is disabled, a custom font can be used as the default font for all sticky notes.</description>
+ </key>
+ <key name="force-default" type="b">
+ <default>false</default>
+ <summary>Whether to force the default color and font on all notes</summary>
+ <description>If this option is enabled, the custom colors and fonts that have been assigned to individual notes will be ignored.</description>
+ </key>
+ <key name="desktop-hide" type="b">
+ <default>true</default>
+ <summary>Whether to hide all notes when the desktop is selected</summary>
+ <description>If this option is enabled, selecting the desktop in any way will automatically hide all the open notes.</description>
+ </key>
+ <key name="confirm-deletion" type="b">
+ <default>true</default>
+ <summary>Whether to ask for confirmation when deleting a note</summary>
+ <description>Empty notes are always deleted without confirmation.</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/stickynotes/org.mate.stickynotes.gschema.xml.in.in b/stickynotes/org.mate.stickynotes.gschema.xml.in.in
deleted file mode 100644
index a2e4ad34..00000000
--- a/stickynotes/org.mate.stickynotes.gschema.xml.in.in
+++ /dev/null
@@ -1,69 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
- <schema id="org.mate.stickynotes" path="/org/mate/stickynotes/">
- <key name="default-width" type="i">
- <default>100</default>
- <_summary>Default width for new notes</_summary>
- <_description>Default width for new sticky notes in pixels.</_description>
- </key>
- <key name="default-height" type="i">
- <default>100</default>
- <_summary>Default height for new notes</_summary>
- <_description>Default height for new sticky notes in pixels.</_description>
- </key>
- <key name="default-color" type="s">
- <default>'#ECF833'</default>
- <_summary>Default color for new notes</_summary>
- <_description>Default color for new sticky notes. This should be in html hex specification, for example "#30FF50".</_description>
- </key>
- <key name="default-font-color" type="s">
- <default>'#000000'</default>
- <_summary>Default color for font</_summary>
- <_description>Default font color for new sticky notes. This should be in html hex specification, for example "#000000".</_description>
- </key>
- <key name="default-font" type="s">
- <default>'Sans 10'</default>
- <_summary>Default font for new notes</_summary>
- <_description>Default font for new sticky notes. This should be a Pango Font Name, for example "Sans Italic 10".</_description>
- </key>
- <key name="sticky" type="b">
- <default>true</default>
- <_summary>Sticky notes' workspace stickyness</_summary>
- <_description>Specifies whether the sticky notes are visible on ALL workspaces on the desktop, or not.</_description>
- </key>
- <key name="locked" type="b">
- <default>false</default>
- <_summary>Sticky notes' locked state</_summary>
- <_description>Specifies whether the sticky notes are locked (non-editable) or not.</_description>
- </key>
- <key name="date-format" type="s">
- <default>'%x'</default>
- <_summary>Date format of note's title</_summary>
- <_description>By default, sticky notes are given the current date as the title when they are created. This format is used; anything that can be parsed by strftime() is valid.</_description>
- </key>
- <key name="use-system-color" type="b">
- <default>true</default>
- <_summary>Whether to use the default system color</_summary>
- <_description>If this option is disabled, a custom color can be used as the default color for all sticky notes.</_description>
- </key>
- <key name="use-system-font" type="b">
- <default>true</default>
- <_summary>Whether to use the default system font</_summary>
- <_description>If this option is disabled, a custom font can be used as the default font for all sticky notes.</_description>
- </key>
- <key name="force-default" type="b">
- <default>false</default>
- <_summary>Whether to force the default color and font on all notes</_summary>
- <_description>If this option is enabled, the custom colors and fonts that have been assigned to individual notes will be ignored.</_description>
- </key>
- <key name="desktop-hide" type="b">
- <default>true</default>
- <_summary>Whether to hide all notes when the desktop is selected</_summary>
- <_description>If this option is enabled, selecting the desktop in any way will automatically hide all the open notes.</_description>
- </key>
- <key name="confirm-deletion" type="b">
- <default>true</default>
- <_summary>Whether to ask for confirmation when deleting a note</_summary>
- <_description>Empty notes are always deleted without confirmation.</_description>
- </key>
- </schema>
-</schemalist>
author	infirit <[email protected]>	2015-09-06 21:55:35 +0200
committer	infirit <[email protected]>	2015-09-06 21:55:35 +0200
commit	df7a7488950139e3884972e2363294051e33d45d (patch)
tree	c442d94aba98b29a69a743701bf9a7d7a1086950 /stickynotes
parent	6bfc67fc80ba929a740d20edd9ba34927dfefafe (diff)
download	mate-applets-df7a7488950139e3884972e2363294051e33d45d.tar.bz2 mate-applets-df7a7488950139e3884972e2363294051e33d45d.tar.xz