diff options
Diffstat (limited to 'mate-dictionary/data')
| -rw-r--r-- | mate-dictionary/data/Makefile.am | 39 | ||||
| -rw-r--r-- | mate-dictionary/data/mate-dictionary.1 | 2 | ||||
| -rw-r--r-- | mate-dictionary/data/mate-dictionary.convert | 5 | ||||
| -rw-r--r-- | mate-dictionary/data/mate-dictionary.schemas.in | 201 | ||||
| -rw-r--r-- | mate-dictionary/data/org.mate.dictionary.gschema.xml.in | 25 |
5 files changed, 48 insertions, 224 deletions
diff --git a/mate-dictionary/data/Makefile.am b/mate-dictionary/data/Makefile.am index 2e38a96c..55f553df 100644 --- a/mate-dictionary/data/Makefile.am +++ b/mate-dictionary/data/Makefile.am @@ -7,7 +7,7 @@ gdictapp_in_files = mate-dictionary.desktop.in gdictapp_DATA = $(gdictapp_in_files:.desktop.in=.desktop) $(gdictapp_in_files): $(gdictapp_in_files:.desktop.in=.desktop.in.in) - @sed -e "s|\@VERSION\@|@VERSION@|" $< > $@ + $(AM_V_GEN)sed -e "s|\@VERSION\@|@VERSION@|" $< > $@ @INTLTOOL_DESKTOP_RULE@ @@ -22,8 +22,10 @@ dictsource_DATA = $(dictsource_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ builderdir = $(datadir)/mate-dictionary -builder_DATA = mate-dictionary-preferences.ui \ - mate-dictionary-source.ui +builder_DATA = \ + mate-dictionary-preferences.ui \ + mate-dictionary-source.ui \ + $(NULL) uidir = $(datadir)/mate-dictionary ui_DATA = mate-dictionary-ui.xml @@ -39,27 +41,29 @@ server_in_files = MATE_DictionaryApplet.server.in server_DATA = $(server_in_files:.server.in=.server) $(server_in_files): $(server_in_files:.server.in=.server.in.in) - @sed \ - -e "s|\@VERSION\@|@VERSION@|" \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ + $(AM_V_GEN)sed \ + -e "s|\@VERSION\@|@VERSION@|" \ + -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ $< > $@ - @INTLTOOL_SERVER_RULE@ endif # BUILD_GDICT_APPLET -schemadir = $(MATECONF_SCHEMA_FILE_DIR) -schemas_in_file = mate-dictionary.schemas.in -schema_DATA = $(schemas_in_file:.schemas.in=.schemas) -@INTLTOOL_SCHEMAS_RULE@ +gsettingsschema_in_files = org.mate.dictionary.gschema.xml.in +gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml) +@INTLTOOL_XML_NOMERGE_RULE@ +@GSETTINGS_RULES@ + +convertdir = $(datadir)/MateConf/gsettings +convert_DATA = mate-dictionary.convert EXTRA_DIST = \ MATE_DictionaryApplet.server.in.in \ mate-dictionary.desktop.in.in \ $(dictsource_in_files) \ $(man_MANS) \ - $(schemas_in_file) \ + $(gsettingsschema_in_files) \ $(builder_DATA) \ $(ui_DATA) \ $(appletui_DATA) \ @@ -71,14 +75,5 @@ CLEANFILES = \ $(server_DATA) \ $(gdictapp_in_files) \ $(gdictapp_DATA) \ - $(schema_DATA) \ + $(gsettings_SCHEMAS) \ $(NULL) - -if MATECONF_SCHEMAS_INSTALL -install-data-local: - if test -z "$(DESTDIR)" ; then \ - MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(schema_DATA) ; \ - fi -else -install-data-local: -endif diff --git a/mate-dictionary/data/mate-dictionary.1 b/mate-dictionary/data/mate-dictionary.1 index ceabc30a..59b7d969 100644 --- a/mate-dictionary/data/mate-dictionary.1 +++ b/mate-dictionary/data/mate-dictionary.1 @@ -43,7 +43,7 @@ on the console without launching the GUI. .B \-\-help Display help information. .SH CONFIGURATION -All the configuration is handled using MateConf. +All the configuration is handled using Gsettings. .SH AUTHOR .B MATE Dictionary was originally written by Spiros Papadimitriou (<[email protected]>), Mike diff --git a/mate-dictionary/data/mate-dictionary.convert b/mate-dictionary/data/mate-dictionary.convert new file mode 100644 index 00000000..01b919a0 --- /dev/null +++ b/mate-dictionary/data/mate-dictionary.convert @@ -0,0 +1,5 @@ +[org.mate.dictionary] +database = /apps/mate-dictionary/database +strategy = /apps/mate-dictionary/strategy +print-font = /apps/mate-dictionary/print-font +source-name = /apps/mate-dictionary/source-name diff --git a/mate-dictionary/data/mate-dictionary.schemas.in b/mate-dictionary/data/mate-dictionary.schemas.in deleted file mode 100644 index 0d204ecd..00000000 --- a/mate-dictionary/data/mate-dictionary.schemas.in +++ /dev/null @@ -1,201 +0,0 @@ -<mateconfschemafile> - <schemalist> - <schema> - <key>/schemas/apps/mate-dictionary/server</key> - <applyto>/apps/mate-dictionary/server</applyto> - <owner>mate-dictionary</owner> - <type>string</type> - <default>dict.org</default> - <locale name="C"> - <short>Dictionary server (Deprecated)</short> - <long>The dictionary server to connect to. The default server is - dict.org. See http://www.dict.org for details on other servers. - This key is deprecated and no longer in use.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/mate-dictionary/port</key> - <applyto>/apps/mate-dictionary/port</applyto> - <owner>mate-dictionary</owner> - <type>int</type> - <default>2628</default> - <locale name="C"> - <short>Port used to connect to server (Deprecated)</short> - <long>The port number to connect to. The default port is 2628. - This key is deprecated and no longer in use.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/mate-dictionary/smart</key> - <applyto>/apps/mate-dictionary/smart</applyto> - <owner>mate-dictionary</owner> - <type>bool</type> - <default>TRUE</default> - <locale name="C"> - <short>Use smart lookup (Deprecated)</short> - <long>Specify whether to use smart lookup. This key is dependant - on whether the dictionary server supports this option. The default - is TRUE. This key is deprecated and no longer in use.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/mate-dictionary/database</key> - <applyto>/apps/mate-dictionary/database</applyto> - <owner>mate-dictionary</owner> - <type>string</type> - <default>!</default> - <locale name="C"> - <short>The default database to use</short> - <long>The name of the default individual database or meta-database to - use on a dictionary source. An exclamation mark ("!") means that all - the databases present in a dictionary source should be searched</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/mate-dictionary/strategy</key> - <applyto>/apps/mate-dictionary/strategy</applyto> - <owner>mate-dictionary</owner> - <type>string</type> - <default>exact</default> - <locale name="C"> - <short>The default search strategy to use</short> - <long>The name of the default search strategy to use on a dictionary - source, if available. The default strategy is 'exact', that is match - exact words.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/mate-dictionary/print-font</key> - <applyto>/apps/mate-dictionary/print-font</applyto> - <owner>mate-dictionary</owner> - <type>string</type> - <default>Serif 12</default> - <locale name="C"> - <short>The font to be used when printing</short> - <long>The font to be used when printing a definition.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/mate-dictionary/source-name</key> - <applyto>/apps/mate-dictionary/source-name</applyto> - <owner>mate-dictionary</owner> - <type>string</type> - <default>Default</default> - <locale name="C"> - <short>The name of the dictionary source used</short> - <long>The name of the dictionary source used to retrieve the - definitions of words.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/mate-dictionary/default-window-width</key> - <applyto>/apps/mate-dictionary/default-window-width</applyto> - <owner>mate-dictionary</owner> - <type>int</type> - <default>-1</default> - <locale name="C"> - <short>The default width of the application window</short> - <long>This key defines the window width and it's used to remember - the size of the dictionary window across sessions. Setting it - to -1 will make the dictionary window use a width based on the - font size.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/mate-dictionary/default-window-height</key> - <applyto>/apps/mate-dictionary/default-window-height</applyto> - <owner>mate-dictionary</owner> - <type>int</type> - <default>-1</default> - <locale name="C"> - <short>The default height of the application window</short> - <long>This key defines the window height and it's used to remember - the size of the dictionary window across sessions. Setting it - to -1 will make the dictionary window use a height based on the - font size.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/mate-dictionary/window-is-maximized</key> - <applyto>/apps/mate-dictionary/window-is-maximized</applyto> - <owner>mate-dictionary</owner> - <type>bool</type> - <default>FALSE</default> - <locale name="C"> - <short>Whether the application window should be maximized</short> - <long>This key defines whether the window should be maximized and it's - used to remember the state of the dictionary window across sessions. - Setting it to TRUE will make the window always appear as - maximized.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/mate-dictionary/sidebar-visible</key> - <applyto>/apps/mate-dictionary/sidebar-visible</applyto> - <owner>mate-dictionary</owner> - <type>bool</type> - <default>FALSE</default> - <locale name="C"> - <short>Whether the sidebar should be visible</short> - <long>This key defines whether the sidebar should be visible - and it's used to remember the state of the sidebar across - sessions. Setting it to TRUE will make the sidebar always - be displayed.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/mate-dictionary/statusbar-visible</key> - <applyto>/apps/mate-dictionary/statusbar-visible</applyto> - <owner>mate-dictionary</owner> - <type>bool</type> - <default>FALSE</default> - <locale name="C"> - <short>Whether the statusbar should be visible</short> - <long>This key defines whether the statusbar should be visible - and it's used to remember the state of the statusbar across - sessions. Setting it to TRUE will make the statusbar always - be displayed.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/mate-dictionary/sidebar-page</key> - <applyto>/apps/mate-dictionary/sidebar-page</applyto> - <owner>mate-dictionary</owner> - <type>string</type> - <default>speller</default> - <locale name="C"> - <short>The page of the sidebar to show</short> - <long>This key defines which page of the sidebar should be - displayed and it's used to remember the setting across - sessions.. It can be "speller" or "databases".</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/mate-dictionary/sidebar-width</key> - <applyto>/apps/mate-dictionary/sidebar-width</applyto> - <owner>mate-dictionary</owner> - <type>int</type> - <default>-1</default> - <locale name="C"> - <short>The width of the sidebar</short> - <long>This key defines the width of the sidebar and it's - used to remember the setting across sessions.</long> - </locale> - </schema> - - </schemalist> - -</mateconfschemafile> diff --git a/mate-dictionary/data/org.mate.dictionary.gschema.xml.in b/mate-dictionary/data/org.mate.dictionary.gschema.xml.in new file mode 100644 index 00000000..e6f5add2 --- /dev/null +++ b/mate-dictionary/data/org.mate.dictionary.gschema.xml.in @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<schemalist> + <schema id="org.mate.dictionary" path="/org/mate/dictionary/" gettext-domain="@GETTEXT_PACKAGE@"> + <key name="database" type="s"> + <default>'!'</default> + <_summary>The default database to use</_summary> + <_description>The name of the default individual database or meta-database to use on a dictionary source. An exclamation mark ("!") means that all the databases present in a dictionary source should be searched</_description> + </key> + <key name="strategy" type="s"> + <default>'exact'</default> + <_summary>The default search strategy to use</_summary> + <_description>The name of the default search strategy to use on a dictionary source, if available. The default strategy is 'exact', that is match exact words.</_description> + </key> + <key name="print-font" type="s"> + <default>'Serif 12'</default> + <_summary>The font to be used when printing</_summary> + <_description>The font to be used when printing a definition.</_description> + </key> + <key name="source-name" type="s"> + <default>'Default'</default> + <_summary>The name of the dictionary source used</_summary> + <_description>The name of the dictionary source used to retrieve the definitions of words.</_description> + </key> + </schema> +</schemalist> |