From 9c159beee589a225cfd7d7d9aede5a3b7948e9d7 Mon Sep 17 00:00:00 2001 From: infirit Date: Tue, 8 Sep 2015 15:38:03 +0200 Subject: Rework gsettings schema building * Bump intltool required version for gsettings support * Extract strings with intltool directly * Let autoconf generate the xml files --- configure.ac | 3 +- po/POTFILES.in | 2 +- src/Makefile.am | 11 +- src/org.mate.system-monitor.gschema.xml.in | 373 ++++++++++++++++++++++++++ src/org.mate.system-monitor.gschema.xml.in.in | 373 -------------------------- 5 files changed, 380 insertions(+), 382 deletions(-) create mode 100644 src/org.mate.system-monitor.gschema.xml.in delete mode 100644 src/org.mate.system-monitor.gschema.xml.in.in diff --git a/configure.ac b/configure.ac index b998b65..9f1c250 100644 --- a/configure.ac +++ b/configure.ac @@ -111,7 +111,7 @@ dnl CXXFLAGS="-fvisibility-inlines-hidden $CXXFLAGS" GLIB_GSETTINGS # i18n stuff -IT_PROG_INTLTOOL([0.41.0]) +IT_PROG_INTLTOOL([0.50.1]) GETTEXT_PACKAGE=mate-system-monitor AC_SUBST(GETTEXT_PACKAGE) @@ -124,6 +124,7 @@ YELP_HELP_INIT AC_CONFIG_FILES([ Makefile src/Makefile +src/org.mate.system-monitor.gschema.xml pixmaps/Makefile po/Makefile.in help/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in index 938f2cf..bd462a0 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -15,7 +15,7 @@ src/load-graph.cpp src/lsof.cpp src/memmaps.cpp src/openfiles.cpp -src/org.mate.system-monitor.gschema.xml.in.in +[type: gettext/gsettings]src/org.mate.system-monitor.gschema.xml.in src/procactions.cpp src/procdialogs.cpp src/procman.cpp diff --git a/src/Makefile.am b/src/Makefile.am index f8a852f..7d40152 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -64,13 +64,11 @@ specdir = $(datadir)/procman # GSettings schemas, enum files and conversion file gsettings_ENUM_NAMESPACE = org.mate.system-monitor gsettings_ENUM_FILES = $(top_srcdir)/src/*.h -gsettings_SCHEMAS = org.mate.system-monitor.gschema.xml +gsettingsschema_in_files = org.mate.system-monitor.gschema.xml.in +gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ @INTLTOOL_XML_NOMERGE_RULE@ -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ - convertdir = $(datadir)/MateConf/gsettings dist_convert_DATA = mate-system-monitor.convert @@ -78,10 +76,9 @@ dist_noinst_DATA = \ $(gsettings_in_file) CLEANFILES = \ - $(gsettings_SCHEMAS) \ - $(gsettings_SCHEMAS).in + $(gsettings_SCHEMAS) EXTRA_DIST = \ - $(gsettings_SCHEMAS).in.in + $(gsettingsschema_in_files) MAINTAINERCLEANFILES = $(gsettings_SCHEMAS:.xml=.valid) diff --git a/src/org.mate.system-monitor.gschema.xml.in b/src/org.mate.system-monitor.gschema.xml.in new file mode 100644 index 0000000..4284f97 --- /dev/null +++ b/src/org.mate.system-monitor.gschema.xml.in @@ -0,0 +1,373 @@ + + + + + (700, 500, 50, 50) + Main window size and position in the form (width, height, xpos, ypos) + + + false + Show process dependencies in tree form + + + false + Solaris mode for CPU percentage + If TRUE, system-monitor operates in 'Solaris mode' where a task's CPU usage is divided by the total number of CPUs. Otherwise, it operates in 'Irix mode'. + + + true + Enable/Disable smooth refresh + + + true + Show warning dialog when killing processes + + + 3000 + Time in milliseconds between updates of the process view + + + 1000 + Time in milliseconds between updates of the graphs + + + false + Whether information about all file systems should be displayed + Whether to display information about all file systems (including types like 'autofs' and 'procfs'). Useful for getting a list of all currently mounted file systems. + + + 5000 + Time in milliseconds between updates of the devices list + + + 1 + Determines which processes to show by default. 0 is All, 1 is user, and 2 is active + + + 2 + Saves the currently viewed tab + 0 for the System Info, 1 for the processes list, 2 for the resources and 3 for the disks list + + + '#FF6E00' + Default graph CPU color + + + '#CB0C29' + Default graph CPU color + + + '#49A835' + Default graph CPU color + + + '#2D7DB3' + Default graph CPU color + + + '#FF6600' + Default graph CPU color + + + '#6600CC' + Default graph CPU color + + + '#990000' + Default graph cpu color + + + '#000099' + Default graph CPU color + + + '#FFCC00' + Default graph CPU color + + + '#009900' + Default graph CPU color + + + '#CC6600' + Default graph CPU color + + + '#330099' + Default graph CPU color + + + '#CC0066' + Default graph CPU color + + + '#00FFCC' + Default graph CPU color + + + '#FFCC99' + Default graph CPU color + + + '#339999' + Default graph CPU color + + + '#AB1852' + Default graph memory color + + + '#49A835' + Default graph swap color + + + '#2D7DB3' + Default graph incoming network traffic color + + + '#EE1D00' + Default graph outgoing network traffic color + + + false + + Show network traffic in bits + + + + + + + + + 0 + Process view sort column + + + [ 0 ] + Process view columns order + + + 0 + Process view sort order + + + 198 + Width of process 'name' column + + + true + Show process 'name' column on startup + + + 0 + Width of process 'owner' column + + + false + Show process 'owner' column on startup + + + 37 + Width of process 'status' column + + + true + Show process 'status' column on startup + + + 0 + Width of process 'virtual memory' column + + + false + Show process 'virtual memory' column on startup + + + 53 + Width of process 'resident memory' column + + + false + Show process 'resident memory' column on startup + + + 0 + Width of process 'writable memory' column + + + false + Show process 'writable memory' column on startup + + + 0 + Width of process 'shared memory' column + + + false + Show process 'shared memory' column on startup + + + 0 + Width of process 'X server memory' column + + + false + Show process 'X server memory' column on startup + + + 0 + Width of process 'CPU %' column + + + true + Show process 'CPU %' column on startup + + + 50 + Width of process 'CPU time' column + + + false + Show process 'CPU time' column on startup + + + 0 + Width of process 'start time' column + + + false + Show process 'start time' column on startup + + + 48 + Width of process 'nice' column + + + true + Show process 'nice' column on startup + + + 48 + Width of process 'PID' column + + + true + Show process 'PID' column on startup + + + 48 + Width of process 'SELinux security context' column + + + false + Show process 'SELinux security context' column on startup + + + 48 + Width of process 'arguments' column + + + false + Show process 'arguments' column on startup + + + 48 + Width of process 'estimated memory usage' column + + + true + Show process 'estimated memory usage' column on startup + + + 48 + Width of process 'Waiting Channel' column + + + true + Show process 'Waiting Channel' column on startup + + + 48 + Width of process 'Control Group' column + + + false + Show process 'Control Group' column on startup + + + 70 + Width of process 'Unit' column + + + true + Show process 'Unit' column on startup + + + 41 + Width of process 'Session' column + + + false + Show process 'Session' column on startup + + + 59 + Width of process 'Seat' column + + + false + Show process 'Seat' column on startup + + + 59 + Width of process 'Owner' column + + + false + Show process 'Owner' column on startup + + + 100 + Width of process 'Priority' column + + + true + Show process 'Priority' column on startup + + + + + 1 + Disk view sort colum + + + 0 + Disk view sort order + + + [ 0 ] + Disk view columns order + + + + + 0 + Memory map sort column + + + 0 + Memory map sort order + + + + + 0 + Open files sort column + + + 0 + Open files sort order + + + diff --git a/src/org.mate.system-monitor.gschema.xml.in.in b/src/org.mate.system-monitor.gschema.xml.in.in deleted file mode 100644 index 4a3c9e9..0000000 --- a/src/org.mate.system-monitor.gschema.xml.in.in +++ /dev/null @@ -1,373 +0,0 @@ - - - - - (700, 500, 50, 50) - <_summary>Main window size and position in the form (width, height, xpos, ypos) - - - false - <_summary>Show process dependencies in tree form - - - false - <_summary>Solaris mode for CPU percentage - <_description>If TRUE, system-monitor operates in 'Solaris mode' where a task's CPU usage is divided by the total number of CPUs. Otherwise, it operates in 'Irix mode'. - - - true - <_summary>Enable/Disable smooth refresh - - - true - <_summary>Show warning dialog when killing processes - - - 3000 - <_summary>Time in milliseconds between updates of the process view - - - 1000 - <_summary>Time in milliseconds between updates of the graphs - - - false - <_summary>Whether information about all file systems should be displayed - <_description>Whether to display information about all file systems (including types like 'autofs' and 'procfs'). Useful for getting a list of all currently mounted file systems. - - - 5000 - <_summary>Time in milliseconds between updates of the devices list - - - 1 - <_summary>Determines which processes to show by default. 0 is All, 1 is user, and 2 is active - - - 2 - <_summary>Saves the currently viewed tab - <_description>0 for the System Info, 1 for the processes list, 2 for the resources and 3 for the disks list - - - '#FF6E00' - <_summary>Default graph CPU color - - - '#CB0C29' - <_summary>Default graph CPU color - - - '#49A835' - <_summary>Default graph CPU color - - - '#2D7DB3' - <_summary>Default graph CPU color - - - '#FF6600' - <_summary>Default graph CPU color - - - '#6600CC' - <_summary>Default graph CPU color - - - '#990000' - <_summary>Default graph cpu color - - - '#000099' - <_summary>Default graph CPU color - - - '#FFCC00' - <_summary>Default graph CPU color - - - '#009900' - <_summary>Default graph CPU color - - - '#CC6600' - <_summary>Default graph CPU color - - - '#330099' - <_summary>Default graph CPU color - - - '#CC0066' - <_summary>Default graph CPU color - - - '#00FFCC' - <_summary>Default graph CPU color - - - '#FFCC99' - <_summary>Default graph CPU color - - - '#339999' - <_summary>Default graph CPU color - - - '#AB1852' - <_summary>Default graph memory color - - - '#49A835' - <_summary>Default graph swap color - - - '#2D7DB3' - <_summary>Default graph incoming network traffic color - - - '#EE1D00' - <_summary>Default graph outgoing network traffic color - - - false - - <_summary>Show network traffic in bits - - - - - - - - - 0 - <_summary>Process view sort column - - - [ 0 ] - <_summary>Process view columns order - - - 0 - <_summary>Process view sort order - - - 198 - <_summary>Width of process 'name' column - - - true - <_summary>Show process 'name' column on startup - - - 0 - <_summary>Width of process 'owner' column - - - false - <_summary>Show process 'owner' column on startup - - - 37 - <_summary>Width of process 'status' column - - - true - <_summary>Show process 'status' column on startup - - - 0 - <_summary>Width of process 'virtual memory' column - - - false - <_summary>Show process 'virtual memory' column on startup - - - 53 - <_summary>Width of process 'resident memory' column - - - false - <_summary>Show process 'resident memory' column on startup - - - 0 - <_summary>Width of process 'writable memory' column - - - false - <_summary>Show process 'writable memory' column on startup - - - 0 - <_summary>Width of process 'shared memory' column - - - false - <_summary>Show process 'shared memory' column on startup - - - 0 - <_summary>Width of process 'X server memory' column - - - false - <_summary>Show process 'X server memory' column on startup - - - 0 - <_summary>Width of process 'CPU %' column - - - true - <_summary>Show process 'CPU %' column on startup - - - 50 - <_summary>Width of process 'CPU time' column - - - false - <_summary>Show process 'CPU time' column on startup - - - 0 - <_summary>Width of process 'start time' column - - - false - <_summary>Show process 'start time' column on startup - - - 48 - <_summary>Width of process 'nice' column - - - true - <_summary>Show process 'nice' column on startup - - - 48 - <_summary>Width of process 'PID' column - - - true - <_summary>Show process 'PID' column on startup - - - 48 - <_summary>Width of process 'SELinux security context' column - - - false - <_summary>Show process 'SELinux security context' column on startup - - - 48 - <_summary>Width of process 'arguments' column - - - false - <_summary>Show process 'arguments' column on startup - - - 48 - <_summary>Width of process 'estimated memory usage' column - - - true - <_summary>Show process 'estimated memory usage' column on startup - - - 48 - <_summary>Width of process 'Waiting Channel' column - - - true - <_summary>Show process 'Waiting Channel' column on startup - - - 48 - <_summary>Width of process 'Control Group' column - - - false - <_summary>Show process 'Control Group' column on startup - - - 70 - <_summary>Width of process 'Unit' column - - - true - <_summary>Show process 'Unit' column on startup - - - 41 - <_summary>Width of process 'Session' column - - - false - <_summary>Show process 'Session' column on startup - - - 59 - <_summary>Width of process 'Seat' column - - - false - <_summary>Show process 'Seat' column on startup - - - 59 - <_summary>Width of process 'Owner' column - - - false - <_summary>Show process 'Owner' column on startup - - - 100 - <_summary>Width of process 'Priority' column - - - true - <_summary>Show process 'Priority' column on startup - - - - - 1 - <_summary>Disk view sort colum - - - 0 - <_summary>Disk view sort order - - - [ 0 ] - <_summary>Disk view columns order - - - - - 0 - <_summary>Memory map sort column - - - 0 - <_summary>Memory map sort order - - - - - 0 - <_summary>Open files sort column - - - 0 - <_summary>Open files sort order - - - -- cgit v1.2.1