From 1acc3477eeb71505d68b66ac7aa4a796f86fe69c Mon Sep 17 00:00:00 2001 From: Brent Hull Date: Fri, 25 Jan 2013 02:39:32 -0500 Subject: Port mate-dictionary (and applet) to Gsettings (main program based on GNOME patch) --- mate-dictionary/data/Makefile.am | 39 ++-- mate-dictionary/data/mate-dictionary.1 | 2 +- mate-dictionary/data/mate-dictionary.convert | 5 + mate-dictionary/data/mate-dictionary.schemas.in | 201 --------------------- .../data/org.mate.dictionary.gschema.xml.in | 25 +++ 5 files changed, 48 insertions(+), 224 deletions(-) create mode 100644 mate-dictionary/data/mate-dictionary.convert delete mode 100644 mate-dictionary/data/mate-dictionary.schemas.in create mode 100644 mate-dictionary/data/org.mate.dictionary.gschema.xml.in (limited to 'mate-dictionary/data') 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 (), 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 @@ - - - - /schemas/apps/mate-dictionary/server - /apps/mate-dictionary/server - mate-dictionary - string - dict.org - - Dictionary server (Deprecated) - 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. - - - - - /schemas/apps/mate-dictionary/port - /apps/mate-dictionary/port - mate-dictionary - int - 2628 - - Port used to connect to server (Deprecated) - The port number to connect to. The default port is 2628. - This key is deprecated and no longer in use. - - - - - /schemas/apps/mate-dictionary/smart - /apps/mate-dictionary/smart - mate-dictionary - bool - TRUE - - Use smart lookup (Deprecated) - 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. - - - - - /schemas/apps/mate-dictionary/database - /apps/mate-dictionary/database - mate-dictionary - string - ! - - The default database to use - 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 - - - - - /schemas/apps/mate-dictionary/strategy - /apps/mate-dictionary/strategy - mate-dictionary - string - exact - - The default search strategy to use - 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. - - - - - /schemas/apps/mate-dictionary/print-font - /apps/mate-dictionary/print-font - mate-dictionary - string - Serif 12 - - The font to be used when printing - The font to be used when printing a definition. - - - - - /schemas/apps/mate-dictionary/source-name - /apps/mate-dictionary/source-name - mate-dictionary - string - Default - - The name of the dictionary source used - The name of the dictionary source used to retrieve the - definitions of words. - - - - - /schemas/apps/mate-dictionary/default-window-width - /apps/mate-dictionary/default-window-width - mate-dictionary - int - -1 - - The default width of the application window - 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. - - - - - /schemas/apps/mate-dictionary/default-window-height - /apps/mate-dictionary/default-window-height - mate-dictionary - int - -1 - - The default height of the application window - 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. - - - - - /schemas/apps/mate-dictionary/window-is-maximized - /apps/mate-dictionary/window-is-maximized - mate-dictionary - bool - FALSE - - Whether the application window should be maximized - 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. - - - - - /schemas/apps/mate-dictionary/sidebar-visible - /apps/mate-dictionary/sidebar-visible - mate-dictionary - bool - FALSE - - Whether the sidebar should be visible - 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. - - - - - /schemas/apps/mate-dictionary/statusbar-visible - /apps/mate-dictionary/statusbar-visible - mate-dictionary - bool - FALSE - - Whether the statusbar should be visible - 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. - - - - - /schemas/apps/mate-dictionary/sidebar-page - /apps/mate-dictionary/sidebar-page - mate-dictionary - string - speller - - The page of the sidebar to show - 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". - - - - - /schemas/apps/mate-dictionary/sidebar-width - /apps/mate-dictionary/sidebar-width - mate-dictionary - int - -1 - - The width of the sidebar - This key defines the width of the sidebar and it's - used to remember the setting across sessions. - - - - - - 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 @@ + + + + + '!' + <_summary>The default database to use + <_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 + + + 'exact' + <_summary>The default search strategy to use + <_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. + + + 'Serif 12' + <_summary>The font to be used when printing + <_description>The font to be used when printing a definition. + + + 'Default' + <_summary>The name of the dictionary source used + <_description>The name of the dictionary source used to retrieve the definitions of words. + + + -- cgit v1.2.1 From cc8a689bdeb46b3c9fe8247a72b05c8d97762474 Mon Sep 17 00:00:00 2001 From: Brent Hull Date: Fri, 25 Jan 2013 13:40:14 -0500 Subject: Add edit button for dictionary sources and fix typo --- mate-dictionary/data/mate-dictionary-preferences.ui | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'mate-dictionary/data') diff --git a/mate-dictionary/data/mate-dictionary-preferences.ui b/mate-dictionary/data/mate-dictionary-preferences.ui index 1f04df8f..d7fa1db1 100644 --- a/mate-dictionary/data/mate-dictionary-preferences.ui +++ b/mate-dictionary/data/mate-dictionary-preferences.ui @@ -102,6 +102,17 @@ True + + + True + True + True + gtk-edit + True + GTK_RELIEF_NORMAL + True + + 0 -- cgit v1.2.1