From 1aa6079a48aacd1b495f6944848e3d432a4b115d Mon Sep 17 00:00:00 2001 From: Brent Hull Date: Thu, 15 Nov 2012 14:23:32 -0500 Subject: Port logview to Gsettings (based on GNOME patches) --- logview/data/Makefile.am | 22 +++---- logview/data/mate-system-log.schemas.in | 80 ------------------------- logview/data/org.mate.system-log.gschema.xml.in | 34 +++++++++++ 3 files changed, 42 insertions(+), 94 deletions(-) delete mode 100644 logview/data/mate-system-log.schemas.in create mode 100644 logview/data/org.mate.system-log.gschema.xml.in (limited to 'logview/data') diff --git a/logview/data/Makefile.am b/logview/data/Makefile.am index 04efb96a..eb96fcbb 100644 --- a/logview/data/Makefile.am +++ b/logview/data/Makefile.am @@ -10,27 +10,21 @@ $(desktop_in_files): $(desktop_in_files:.desktop.in=.desktop.in.in) man_MANS = mate-system-log.1 -schemasdir = $(MATECONF_SCHEMA_FILE_DIR) -schemas_in_files = mate-system-log.schemas.in -schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) -@INTLTOOL_SCHEMAS_RULE@ +gsettingsschema_in_files = org.mate.system-log.gschema.xml.in +gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml) +.PRECIOUS: $(gsettings_SCHEMAS) -install-data-local: $(schemas_DATA) -if MATECONF_SCHEMAS_INSTALL - if test -z "$(DESTDIR)" ; then \ - for p in $^ ; do \ - MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \ - done \ - fi -endif +@INTLTOOL_XML_NOMERGE_RULE@ + +@GSETTINGS_RULES@ EXTRA_DIST = \ mate-system-log.desktop.in.in \ $(xml_DATA) \ $(man_MANS) \ - $(schemas_in_files) + $(gsettingsschema_in_files) DISTCLEANFILES = \ $(desktop_DATA) \ $(desktop_in_files) \ - $(schemas_DATA) + $(gsettings_SCHEMAS) diff --git a/logview/data/mate-system-log.schemas.in b/logview/data/mate-system-log.schemas.in deleted file mode 100644 index 7961605f..00000000 --- a/logview/data/mate-system-log.schemas.in +++ /dev/null @@ -1,80 +0,0 @@ - - - - - /schemas/apps/mate-system-log/logfile - /apps/mate-system-log/logfile - logview - string - /var/log/messages - - Log file to open up on startup - Specifies the log file displayed at startup. - The default is either /var/adm/messages or - /var/log/messages, depending on your - operating system. - - - - - - /schemas/apps/mate-system-log/fontsize - /apps/mate-system-log/fontsize - logview - int - 10 - - Size of the font used to display the log - Specifies the size of the fixed-width font used - to display the log in the main tree view. - The default is taken from the default terminal - font size. - - - - - - /schemas/apps/mate-system-log/height - /apps/mate-system-log/height - logview - int - 400 - - Height of the main window in pixels - Specifies the height of the log viewer main window - in pixels. - - - - - - /schemas/apps/mate-system-log/width - /apps/mate-system-log/width - logview - int - 600 - - Width of the main window in pixels - Specifies the width of the log viewer main window - in pixels. - - - - - - /schemas/apps/mate-system-log/logfiles - /apps/mate-system-log/logfiles - logview - list - string - - Log files to open up on startup - Specifies a list of log files to open up at startup. - A default list is created by reading /etc/syslog.conf. - - - - - - - diff --git a/logview/data/org.mate.system-log.gschema.xml.in b/logview/data/org.mate.system-log.gschema.xml.in new file mode 100644 index 00000000..0f00134e --- /dev/null +++ b/logview/data/org.mate.system-log.gschema.xml.in @@ -0,0 +1,34 @@ + + + + '/var/log/messages' + <_summary>Log file to open up on startup + <_description>Specifies the log file displayed at startup. The default is either /var/adm/messages or /var/log/messages, depending on your operating system. + + + 10 + <_summary>Size of the font used to display the log + <_description>Specifies the size of the fixed-width font used to display the log in the main tree view. The default is taken from the default terminal font size. + + + 400 + <_summary>Height of the main window in pixels + <_description>Specifies the height of the log viewer main window in pixels. + + + 600 + <_summary>Width of the main window in pixels + <_description>Specifies the width of the log viewer main window in pixels. + + + [] + <_summary>Log files to open up on startup + <_description>Specifies a list of log files to open up at startup. A default list is created by reading /etc/syslog.conf. + + + [] + <_summary>List of saved filters + <_description>List of saved regexp filters + + + -- cgit v1.2.1