From 9ef7e261d4a9ea536d6f467c2b9bd1381bcd73aa Mon Sep 17 00:00:00 2001 From: infirit Date: Sun, 6 Sep 2015 16:20:20 +0200 Subject: Rework gsettings schema building * Bump intltool required version for gsettings support * Extract strings with intltool directly * Let autoconf generate the xml files --- applets/clock/Makefile.am | 9 +-- .../org.mate.panel.applet.clock.gschema.xml.in | 88 ++++++++++++++++++++++ .../org.mate.panel.applet.clock.gschema.xml.in.in | 88 ---------------------- applets/fish/Makefile.am | 8 +- .../fish/org.mate.panel.applet.fish.gschema.xml.in | 34 +++++++++ .../org.mate.panel.applet.fish.gschema.xml.in.in | 34 --------- applets/wncklet/Makefile.am | 14 ++-- ...rg.mate.panel.applet.window-list.gschema.xml.in | 24 ++++++ ...mate.panel.applet.window-list.gschema.xml.in.in | 24 ------ ....panel.applet.workspace-switcher.gschema.xml.in | 24 ++++++ ...nel.applet.workspace-switcher.gschema.xml.in.in | 24 ------ 11 files changed, 183 insertions(+), 188 deletions(-) create mode 100644 applets/clock/org.mate.panel.applet.clock.gschema.xml.in delete mode 100644 applets/clock/org.mate.panel.applet.clock.gschema.xml.in.in create mode 100644 applets/fish/org.mate.panel.applet.fish.gschema.xml.in delete mode 100644 applets/fish/org.mate.panel.applet.fish.gschema.xml.in.in create mode 100644 applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in delete mode 100644 applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in.in create mode 100644 applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in delete mode 100644 applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in.in (limited to 'applets') diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am index 950ecddf..5d1c4bfc 100644 --- a/applets/clock/Makefile.am +++ b/applets/clock/Makefile.am @@ -155,16 +155,15 @@ ui_DATA = clock.ui xmluidir = $(datadir)/mate-panel/ui xmlui_DATA = clock-menu.xml -gsettings_SCHEMAS = org.mate.panel.applet.clock.gschema.xml +clock_gschemas_in = org.mate.panel.applet.clock.gschema.xml.in +gsettings_SCHEMAS = $(clock_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 = \ org.mate.panel.ClockApplet.mate-panel-applet.in.in \ - $(gsettings_SCHEMAS).in.in \ + $(clock_gschemas_in) \ $(xmlui_DATA) \ $(ui_DATA) \ clock-marshallers.list \ diff --git a/applets/clock/org.mate.panel.applet.clock.gschema.xml.in b/applets/clock/org.mate.panel.applet.clock.gschema.xml.in new file mode 100644 index 00000000..ee1b6902 --- /dev/null +++ b/applets/clock/org.mate.panel.applet.clock.gschema.xml.in @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + '24-hour' + Hour format + This key specifies the hour format used by the clock applet. Possible values are "12-hour", "24-hour", "internet", "unix" and "custom". If set to "internet", the clock will display Internet time. The Internet time system divides the day into 1000 ".beats". There are no time zones in this system, so time is the same all over the world. If set to "unix", the clock will display time in seconds since Epoch, i.e. 1970-01-01. If set to "custom", the clock will display time according to the format specified in the custom_format key. + + + '' + Custom format of the clock + This key specifies the format used by the clock applet when the format key is set to "custom". You can use conversion specifiers understood by strftime() to obtain a specific format. See the strftime() manual for more information. + + + false + Show time with seconds + If true, display seconds in time. + + + true + Show date in clock + If true, display date in the clock, in addition to time. + + + true + Show date in tooltip + If true, show date in a tooltip when the pointer is over the clock. + + + true + Show weather in clock + If true, display a weather icon. + + + true + Show temperature in clock + If true, show the temperature next to the weather icon. + + + true + Show week numbers in calendar + If true, show week numbers in the calendar. + + + false + Expand list of locations + If true, expand the list of locations in the calendar window. + + + [] + List of locations + A list of locations to display in the calendar window. + + + 'Centigrade' + Temperature unit + The unit to use when showing temperatures. + + + 'm/s' + Speed unit + The unit to use when showing wind speed. + + + diff --git a/applets/clock/org.mate.panel.applet.clock.gschema.xml.in.in b/applets/clock/org.mate.panel.applet.clock.gschema.xml.in.in deleted file mode 100644 index 9a24988f..00000000 --- a/applets/clock/org.mate.panel.applet.clock.gschema.xml.in.in +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - '24-hour' - <_summary>Hour format - <_description>This key specifies the hour format used by the clock applet. Possible values are "12-hour", "24-hour", "internet", "unix" and "custom". If set to "internet", the clock will display Internet time. The Internet time system divides the day into 1000 ".beats". There are no time zones in this system, so time is the same all over the world. If set to "unix", the clock will display time in seconds since Epoch, i.e. 1970-01-01. If set to "custom", the clock will display time according to the format specified in the custom_format key. - - - '' - <_summary>Custom format of the clock - <_description>This key specifies the format used by the clock applet when the format key is set to "custom". You can use conversion specifiers understood by strftime() to obtain a specific format. See the strftime() manual for more information. - - - false - <_summary>Show time with seconds - <_description>If true, display seconds in time. - - - true - <_summary>Show date in clock - <_description>If true, display date in the clock, in addition to time. - - - true - <_summary>Show date in tooltip - <_description>If true, show date in a tooltip when the pointer is over the clock. - - - true - <_summary>Show weather in clock - <_description>If true, display a weather icon. - - - true - <_summary>Show temperature in clock - <_description>If true, show the temperature next to the weather icon. - - - true - <_summary>Show week numbers in calendar - <_description>If true, show week numbers in the calendar. - - - false - <_summary>Expand list of locations - <_description>If true, expand the list of locations in the calendar window. - - - [] - <_summary>List of locations - <_description>A list of locations to display in the calendar window. - - - 'Centigrade' - <_summary>Temperature unit - <_description>The unit to use when showing temperatures. - - - 'm/s' - <_summary>Speed unit - <_description>The unit to use when showing wind speed. - - - 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 @@ + + + + 'Wanda' + The fish's name + A fish without a name is a pretty dull fish. Bring your fish to life by naming him. + + + 'wanda.png' + The fish's animation pixmap + 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. + + + 'fortune' + Command to execute on click + This key specifies the command that will be tried to execute when the fish is clicked. + + + 8 + Frames in fish's animation + This key specifies the number of frames that will be displayed in the fish's animation. + + + 0.3 + Pause per frame + This key specifies the number of seconds each frame will be displayed. + + + false + Rotate on vertical panels + If true, the fish's animation will be displayed rotated on vertical panels. + + + 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 @@ - - - - 'Wanda' - <_summary>The fish's name - <_description>A fish without a name is a pretty dull fish. Bring your fish to life by naming him. - - - 'wanda.png' - <_summary>The fish's animation pixmap - <_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. - - - 'fortune' - <_summary>Command to execute on click - <_description>This key specifies the command that will be tried to execute when the fish is clicked. - - - 8 - <_summary>Frames in fish's animation - <_description>This key specifies the number of frames that will be displayed in the fish's animation. - - - 0.3 - <_summary>Pause per frame - <_description>This key specifies the number of seconds each frame will be displayed. - - - false - <_summary>Rotate on vertical panels - <_description>If true, the fish's animation will be displayed rotated on vertical panels. - - - diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am index d7cba006..db61f873 100644 --- a/applets/wncklet/Makefile.am +++ b/applets/wncklet/Makefile.am @@ -84,21 +84,19 @@ xmlui_DATA = \ showdesktop-menu.xml \ window-list-menu.xml -gsettings_SCHEMAS = \ - org.mate.panel.applet.window-list.gschema.xml \ - org.mate.panel.applet.workspace-switcher.gschema.xml +wncklet_gschemas_in = \ + org.mate.panel.applet.window-list.gschema.xml.in \ + org.mate.panel.applet.workspace-switcher.gschema.xml.in +gsettings_SCHEMAS = $(wncklet_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 = \ org.mate.panel.Wncklet.mate-panel-applet.in.in \ $(service_in_files) \ $(xmlui_DATA) \ - org.mate.panel.applet.window-list.gschema.xml.in.in \ - org.mate.panel.applet.workspace-switcher.gschema.xml.in.in \ + $(wncklet_gschemas_in) \ $(ui_DATA) CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) diff --git a/applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in b/applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in new file mode 100644 index 00000000..0f2d871d --- /dev/null +++ b/applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in @@ -0,0 +1,24 @@ + + + + + + + + + false + Show windows from all workspaces + If true, the window list will show windows from all workspaces. Otherwise it will only display windows from the current workspace. + + + 'never' + When to group windows + Decides when to group windows from the same application on the window list. Possible values are "never", "auto" and "always". + + + true + Move windows to current workspace when unminimized + If true, then when unminimizing a window, move it to the current workspace. Otherwise, switch to the workspace of the window. + + + diff --git a/applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in.in b/applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in.in deleted file mode 100644 index a9647379..00000000 --- a/applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in.in +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - false - <_summary>Show windows from all workspaces - <_description>If true, the window list will show windows from all workspaces. Otherwise it will only display windows from the current workspace. - - - 'never' - <_summary>When to group windows - <_description>Decides when to group windows from the same application on the window list. Possible values are "never", "auto" and "always". - - - true - <_summary>Move windows to current workspace when unminimized - <_description>If true, then when unminimizing a window, move it to the current workspace. Otherwise, switch to the workspace of the window. - - - diff --git a/applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in b/applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in new file mode 100644 index 00000000..c49f472d --- /dev/null +++ b/applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in @@ -0,0 +1,24 @@ + + + + false + Display workspace names + If true, the workspaces in the workspace switcher will display the names of the workspaces. Otherwise they will display the windows on the workspace. This setting only works when the window manager is Marco. + + + true + Display all workspaces + If true, the workspace switcher will show all workspaces. Otherwise it will only show the current workspace. + + + 1 + Rows in workspace switcher + This key specifies how many rows (for horizontal layout) or columns (for vertical layout) the workspace switcher shows the workspaces in. This key is only relevant if the display_all_workspaces key is true. + + + false + Wrap around on scroll + If true, the workspace switcher will allow wrap-around, which means switching from the first to the last workspace and vice versa via scrolling. + + + diff --git a/applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in.in b/applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in.in deleted file mode 100644 index 82a20922..00000000 --- a/applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in.in +++ /dev/null @@ -1,24 +0,0 @@ - - - - false - <_summary>Display workspace names - <_description>If true, the workspaces in the workspace switcher will display the names of the workspaces. Otherwise they will display the windows on the workspace. This setting only works when the window manager is Marco. - - - true - <_summary>Display all workspaces - <_description>If true, the workspace switcher will show all workspaces. Otherwise it will only show the current workspace. - - - 1 - <_summary>Rows in workspace switcher - <_description>This key specifies how many rows (for horizontal layout) or columns (for vertical layout) the workspace switcher shows the workspaces in. This key is only relevant if the display_all_workspaces key is true. - - - false - <_summary>Wrap around on scroll - <_description>If true, the workspace switcher will allow wrap-around, which means switching from the first to the last workspace and vice versa via scrolling. - - - -- cgit v1.2.1