From eb7b95cc5e20488865a6950341c3a8ed8d721b55 Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas Date: Tue, 6 Nov 2012 23:57:37 +0100 Subject: fix schema installation --- src/Makefile.am | 11 +- src/mate-system-monitor.schemas.in | 771 ------------------------ src/org.mate.mate-system-monitor.gschema.xml.in | 282 --------- src/org.mate.system-monitor.gschema.xml.in.in | 282 +++++++++ src/procman.h | 2 +- 5 files changed, 289 insertions(+), 1059 deletions(-) delete mode 100644 src/mate-system-monitor.schemas.in delete mode 100644 src/org.mate.mate-system-monitor.gschema.xml.in create mode 100644 src/org.mate.system-monitor.gschema.xml.in.in diff --git a/src/Makefile.am b/src/Makefile.am index 6d982b0..69535c3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -49,13 +49,14 @@ specdir = $(datadir)/procman # GSettings schemas, enum files and conversion file -gsettings_ENUM_NAMESPACE = org.mate.mate-system-monitor +gsettings_ENUM_NAMESPACE = org.mate.system-monitor gsettings_ENUM_FILES = $(top_srcdir)/src/*.h -gsettingsschemadir = $(datadir)/glib-2.0/schemas -gsettings_in_file = org.mate.mate-system-monitor.gschema.xml.in -gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml) -@INTLTOOL_XML_NOMERGE_RULE@ +gsettings_SCHEMAS = org.mate.system-monitor.gschema.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' < $< > $@ dist_noinst_DATA = \ $(gsettings_in_file) diff --git a/src/mate-system-monitor.schemas.in b/src/mate-system-monitor.schemas.in deleted file mode 100644 index 7c75751..0000000 --- a/src/mate-system-monitor.schemas.in +++ /dev/null @@ -1,771 +0,0 @@ - - - - - /schemas/apps/procman/width - /apps/procman/width - procman - int - 440 - - Main Window width - - - - - - /schemas/apps/procman/height - /apps/procman/height - procman - int - 495 - - Main Window height - - - - - - /schemas/apps/procman/show_tree - /apps/procman/show_tree - procman - bool - FALSE - - Show process dependencies in tree form - - - - - - /schemas/apps/procman/solaris_mode - /apps/procman/solaris_mode - procman - bool - 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. Else it operates in 'Irix mode'. - - - - - /schemas/apps/procman/smooth_refresh - /apps/procman/smooth_refresh - procman - bool - TRUE - - Enable/Disable smooth refresh - - - - - - /schemas/apps/procman/kill_dialog - /apps/procman/kill_dialog - procman - bool - TRUE - - Show warning dialog when killing processes - - - - - - /schemas/apps/procman/update_interval - /apps/procman/update_interval - procman - int - 3000 - - Time in milliseconds between updates of the process view - - - - - - /schemas/apps/procman/graph_update_interval - /apps/procman/graph_update_interval - procman - int - 1000 - - Time in milliseconds between updates of the graphs - - - - - - /schemas/apps/procman/show_all_fs - /apps/procman/show_all_fs - procman - bool - False - - Whether information about all filesystems should be displayed - Whether to display information about all filesystems (including types like 'autofs' and 'procfs'). Useful for getting a list of all currently mounted filesystems. - - - - - - /schemas/apps/procman/disks_interval - /apps/procman/disks_interval - procman - int - 5000 - - Time in milliseconds between updates of the devices list - - - - - - /schemas/apps/procman/view_as - /apps/procman/view_as - procman - int - 1 - - Determines which processes to show by default. 0 is All, 1 is user, and 2 is active - - - - - - /schemas/apps/procman/current_tab - /apps/procman/current_tab - procman - int - 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 - - - - - /schemas/apps/procman/cpu_color0 - /apps/procman/cpu_color0 - procman - string - #FF6E00 - - Default graph cpu color - - - - - - /schemas/apps/procman/cpu_color1 - /apps/procman/cpu_color1 - procman - string - #CB0C29 - - Default graph cpu color - - - - - - /schemas/apps/procman/cpu_color2 - /apps/procman/cpu_color2 - procman - string - #49A835 - - Default graph cpu color - - - - - - /schemas/apps/procman/cpu_color3 - /apps/procman/cpu_color3 - procman - string - #2D7DB3 - - Default graph cpu color - - - - - - /schemas/apps/procman/mem_color - /apps/procman/mem_color - procman - string - #AB1852 - - Default graph mem color - - - - - - /schemas/apps/procman/swap_color - /apps/procman/swap_color - procman - string - #49A835 - - Default graph swap color - - - - - - /schemas/apps/procman/net_in_color - /apps/procman/net_in_color - procman - string - #2D7DB3 - - Default graph incoming network traffic color - - - - - - /schemas/apps/procman/net_out_color - /apps/procman/net_out_color - procman - string - #844798 - - Default graph outgoing network traffic color - - - - - - /schemas/apps/procman/proctree/sort_col - /apps/procman/proctree/sort_col - procman - int - 0 - - Process view sort column - - - - - - /schemas/apps/procman/proctree/columns_order - /apps/procman/proctree/columns_order - procman - list - int - [0] - - Process view columns order - - - - - - /schemas/apps/procman/proctree/sort_order - /apps/procman/proctree/sort_order - procman - int - 0 - - Process view sort order - - - - - - - /schemas/apps/procman/proctree/col_0_width - /apps/procman/proctree/col_0_width - procman - int - 198 - - Width of process 'name' column - - - - - - /schemas/apps/procman/proctree/col_0_visible - /apps/procman/proctree/col_0_visible - procman - bool - TRUE - - Show process 'name' column on startup - - - - - - - /schemas/apps/procman/proctree/col_1_width - /apps/procman/proctree/col_1_width - procman - int - 0 - - Width of process 'owner' column - - - - - - /schemas/apps/procman/proctree/col_1_visible - /apps/procman/proctree/col_1_visible - procman - bool - FALSE - - Show process 'owner' column on startup - - - - - - - /schemas/apps/procman/proctree/col_2_width - /apps/procman/proctree/col_2_width - procman - int - 37 - - Width of process 'status' column - - - - - - /schemas/apps/procman/proctree/col_2_visible - /apps/procman/proctree/col_2_visible - procman - bool - TRUE - - Show process 'status' column on startup - - - - - - - /schemas/apps/procman/proctree/col_3_width - /apps/procman/proctree/col_3_width - procman - int - 0 - - Width of process 'virtual memory' column - - - - - - /schemas/apps/procman/proctree/col_3_visible - /apps/procman/proctree/col_3_visible - procman - bool - FALSE - - Show process 'virtual memory' column on startup - - - - - - - /schemas/apps/procman/proctree/col_4_width - /apps/procman/proctree/col_4_width - procman - int - 53 - - Width of process 'resident memory' column - - - - - - /schemas/apps/procman/proctree/col_4_visible - /apps/procman/proctree/col_4_visible - procman - bool - FALSE - - Show process 'resident memory' column on startup - - - - - - - /schemas/apps/procman/proctree/col_5_width - /apps/procman/proctree/col_5_width - procman - int - 0 - - Width of process 'writable memory' column - - - - - - /schemas/apps/procman/proctree/col_5_visible - /apps/procman/proctree/col_5_visible - procman - bool - FALSE - - Show process 'writable memory' column on startup - - - - - - - /schemas/apps/procman/proctree/col_6_width - /apps/procman/proctree/col_6_width - procman - int - 0 - - Width of process 'shared memory' column - - - - - - /schemas/apps/procman/proctree/col_6_visible - /apps/procman/proctree/col_6_visible - procman - bool - FALSE - - Show process 'shared memory' column on startup - - - - - - - /schemas/apps/procman/proctree/col_7_width - /apps/procman/proctree/col_7_width - procman - int - 0 - - Width of process 'X server memory' column - - - - - - /schemas/apps/procman/proctree/col_7_visible - /apps/procman/proctree/col_7_visible - procman - bool - FALSE - - Show process 'X server memory' column on startup - - - - - - - /schemas/apps/procman/proctree/col_8_width - /apps/procman/proctree/col_8_width - procman - int - 0 - - Width of process 'CPU %' column - - - - - - /schemas/apps/procman/proctree/col_8_visible - /apps/procman/proctree/col_8_visible - procman - bool - TRUE - - Show process 'CPU %' column on startup - - - - - - - /schemas/apps/procman/proctree/col_9_width - /apps/procman/proctree/col_9_width - procman - int - 50 - - Width of process 'CPU time' column - - - - - - /schemas/apps/procman/proctree/col_9_visible - /apps/procman/proctree/col_9_visible - procman - bool - FALSE - - Show process 'CPU time' column on startup - - - - - - - /schemas/apps/procman/proctree/col_10_width - /apps/procman/proctree/col_10_width - procman - int - 0 - - Width of process 'start time' column - - - - - - /schemas/apps/procman/proctree/col_10_visible - /apps/procman/proctree/col_10_visible - procman - bool - FALSE - - Show process 'start time' column on startup - - - - - - - /schemas/apps/procman/proctree/col_11_width - /apps/procman/proctree/col_11_width - procman - int - 48 - - Width of process 'nice' column - - - - - - /schemas/apps/procman/proctree/col_11_visible - /apps/procman/proctree/col_11_visible - procman - bool - TRUE - - Show process 'nice' column on startup - - - - - - - /schemas/apps/procman/proctree/col_12_width - /apps/procman/proctree/col_12_width - procman - int - 48 - - Width of process 'PID' column - - - - - - /schemas/apps/procman/proctree/col_12_visible - /apps/procman/proctree/col_12_visible - procman - bool - TRUE - - Show process 'PID' column on startup - - - - - - - /schemas/apps/procman/proctree/col_13_width - /apps/procman/proctree/col_13_width - procman - int - 48 - - Width of process 'SELinux security context' column - - - - - - /schemas/apps/procman/proctree/col_13_visible - /apps/procman/proctree/col_13_visible - procman - bool - FALSE - - Show process 'SELinux security context' column on startup - - - - - - - /schemas/apps/procman/proctree/col_14_width - /apps/procman/proctree/col_14_width - procman - int - 48 - - Width of process 'arguments' column - - - - - - /schemas/apps/procman/proctree/col_14_visible - /apps/procman/proctree/col_14_visible - procman - bool - FALSE - - Show process 'arguments' column on startup - - - - - - - /schemas/apps/procman/proctree/col_15_width - /apps/procman/proctree/col_15_width - procman - int - 48 - - Width of process 'estimated memory usage' column - - - - - - /schemas/apps/procman/proctree/col_15_visible - /apps/procman/proctree/col_15_visible - procman - bool - TRUE - - Show process 'estimated memory usage' column on startup - - - - - - - /schemas/apps/procman/proctree/col_16_width - /apps/procman/proctree/col_16_width - procman - int - 48 - - Width of process 'Waiting Channel' column - - - - - - /schemas/apps/procman/proctree/col_16_visible - /apps/procman/proctree/col_16_visible - procman - bool - TRUE - - Show process 'Waiting Channel' column on startup - - - - - - - /schemas/apps/procman/disktreenew/sort_col - /apps/procman/disktreenew/sort_col - procman - int - 1 - - Process view sort column - - - - - - /schemas/apps/procman/disktreenew/sort_order - /apps/procman/disktreenew/sort_order - procman - int - 0 - - Process view sort order - - - - - - /schemas/apps/procman/disktreenew/columns_order - /apps/procman/disktreenew/columns_order - procman - list - int - [0] - - Disk view columns order - - - - - - /schemas/apps/procman/memmapstree/sort_col - /apps/procman/memmapstree/sort_col - procman - int - 0 - - Process view sort column - - - - - - /schemas/apps/procman/memmapstree/sort_order - /apps/procman/memmapstree/sort_order - procman - int - 0 - - Process view sort order - - - - - - - diff --git a/src/org.mate.mate-system-monitor.gschema.xml.in b/src/org.mate.mate-system-monitor.gschema.xml.in deleted file mode 100644 index 5edbb85..0000000 --- a/src/org.mate.mate-system-monitor.gschema.xml.in +++ /dev/null @@ -1,282 +0,0 @@ - - - - - 440 - Main Window width - - - 495 - Main Window height - - - 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. Else 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 filesystems should be displayed - Whether to display information about all filesystems (including types like 'autofs' and 'procfs'). Useful for getting a list of all currently mounted filesystems. - - - 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 - - - '#AB1852' - Default graph mem color - - - '#49A835' - Default graph swap color - - - '#2D7DB3' - Default graph incoming network traffic color - - - '#844798' - Default graph outgoing network traffic color - - - false - - <_summary>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 - - - - - 1 - Process view sort column - - - 0 - Process view sort order - - - [ 0 ] - Disk view columns order - - - - - 0 - Process view sort column - - - 0 - Process view sort order - - - - - 0 - <_summary>Process view sort column - - - 0 - <_summary>Process view sort order - - - diff --git a/src/org.mate.system-monitor.gschema.xml.in.in b/src/org.mate.system-monitor.gschema.xml.in.in new file mode 100644 index 0000000..92c3c8a --- /dev/null +++ b/src/org.mate.system-monitor.gschema.xml.in.in @@ -0,0 +1,282 @@ + + + + + 440 + Main Window width + + + 495 + Main Window height + + + 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. Else 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 filesystems should be displayed + Whether to display information about all filesystems (including types like 'autofs' and 'procfs'). Useful for getting a list of all currently mounted filesystems. + + + 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 + + + '#AB1852' + Default graph mem color + + + '#49A835' + Default graph swap color + + + '#2D7DB3' + Default graph incoming network traffic color + + + '#844798' + Default graph outgoing network traffic color + + + false + + <_summary>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 + + + + + 1 + Process view sort column + + + 0 + Process view sort order + + + [ 0 ] + Disk view columns order + + + + + 0 + Process view sort column + + + 0 + Process view sort order + + + + + 0 + <_summary>Process view sort column + + + 0 + <_summary>Process view sort order + + + diff --git a/src/procman.h b/src/procman.h index c44087a..c71cff2 100644 --- a/src/procman.h +++ b/src/procman.h @@ -40,7 +40,7 @@ struct LoadGraph; #include "smooth_refresh.h" #include "prettytable.h" -#define GSM_GSETTINGS_SCHEMA "org.mate.mate-system-monitor" +#define GSM_GSETTINGS_SCHEMA "org.mate.system-monitor" enum { -- cgit v1.2.1