...
 
Commits (128)
Coding style
============
# Meson
The current codebase is not really consistent about coding
style. However, for new code we should conform to what seems to be the
most common habits:
## configure
meson build --prefix /home/benoit/gnome
* Use four-space indents.
## build
ninja -C build
* Put open curly braces on the same line of the associated
statement. Omit braces if *both* sides of the statement are on one
line. So for instance
## clean
ninja -C build -t clean
if (foo = 0) {
bar ();
baz ();
} else {
qux ();
}
## start from scratch
rm -rf build
and
if (foo = 0)
bar ();
else
qux ();
* Put one space between the function name and the open parenthesis, so
foo ();
# Old
and not
## configure
./autogen.sh --prefix=/home/benoit/gnome
## build
make
foo();
\ No newline at end of file
Chris Kühl
E-mail: blixtra@gmail.com
Userid: chriskuehl
Robert Roth
E-mail: robert.roth.off@gmail.com
IRC/Matrix: evfool
New in 3.32.0 - 11 March 2019
* added/updated translations
Seong-ho Cho (ko)
Ryuta Fujii (jp)
New in 3.31.92 - 5 March 2019
* added/updated translations
Jiri Grönroos (fi)
Sveinn í Felli (is)
Asier Sarasua Garmendia (eu)
Nathan Follens (nl)
Aurimas Černius (lt)
Stas Solovey (ru)
Rafael Fontenelle (pt_BR)
Milo Casagrande (it)
Fabio Tomat (fur)
Марко Костић (sr)
Tim Sabsch (de)
Rūdolfs Mazurs (lv)
List of fixed bugs
gitlab!3 - Luca Bacci: fixed issue with system icon change
New in 3.31.91 - 18 February 2019
* added/updated translations
Efstathios Iosifidis (el)
Yi-Jyun Pan (zh_TW)
Baurzhan Muftakhidinov (kk)
Fran Diéguez (gl)
Kukuh Syafaat (id)
Alan Mortensen (da)
Daniel Șerbănescu (ro)
Balázs Úr (hu)
Matej Urbančič (sl)
Emin Tufan (tr)
Marek Cernocky (cz)
Daniel Mustieles (es)
Piotr Drąg (pl)
Anders Jonsson (sv)
Jordi Mas (ca)
Jiri Grönroos (fi)
List of fixed bugs
gitlab!5 - Sam Hewitt: updated application icon
New in 3.31.90 - 4 February 2019
* added/updated translations
Efstathios Iosifidis (he)
Fabio Tomat (fur)
Anders Jonsson (sv)
Sabri Unal (tr)
Ryuta Fujii (ja)
Daniel Mustieles (es)
Julien Humbert (fr)
Matej Urbančič (sl)
Balázs Úr (hu)
Fran Diéguez (gl)
Daniel Șerbănescu (ro)
Kukuh Syafaat (id)
List of fixed bugs
gitlab#89 - Removed appmenu
gitlab#93 - use delayed g_settings write
New in 3.31.3 - 10 December 2018
* added/updated translations
Stas Solovey (ru)
Dušan Kazik (sk)
Anish Sheela (ml)
Carmen Bianca Bakker (eo)
Iñaki Larrañaga Murgoitio (eu)
Charles Monzat (fr)
List of fixed bugs
gitlab#89 - Removed appmenu
gitlab#93 - use delayed g_settings write
New in 3.30.0 - 3 September 2018
* added/updated translations
Jiri Grönroos (fi)
Sveinn í Felli (is)
Safa Alfulaij (ar)
Baurzhan Muftakhidinov (kk)
Marcos Lans, Fran Diéguez (gl)
Hwan Jo (ko)
Kukuh Syafaat (id)
Milo Casagrande (it)
Rūdolfs Mazurs (lv)
Balázs Meskó (hu)
Goran Vidović (hr)
Ask Hjorth Larsen (da)
New in 3.29.91 - 13 Augsut 2018
* added/updated translations
Mario Blättermann (de)
Matej Urbančič (sl)
Piotr Drąg (pl)
Charles Monzat (fr)
Anders Jonsson (se)
Aurimas Černius (lt)
Emin Tufan Çetin (tr)
New in 3.29.90 - 30 July 2018
* added/updated translations
Daniel Musteles (es)
Fabio Tomat (fur)
Bruno Lopes da Silva (pt_BR)
Daniel Șerbănescu (ro)
List of fixed bugs
Coding style fixes
Build fixes
New in 3.29.3 - 18 June 2018
* added/updated translations
Stas Solovey (ru)
Yi-Jyun Pan (zh_tw)
Marek Černocký (cz)
Efstathios Iosifidis (he)
List of fixed bugs
gitlab#80 ship app icon
796168 Fixed crash caused by regex error
Migrate to meson
Updated bugzilla references to gitlab
Use short process name for process dialog title
New in 3.28.2 - 9 May 2018
* added/updated translations
......
install_subdir(
join_paths('public', 'hicolor'),
install_dir: join_paths(datadir, 'icons')
)
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
width="128"
height="128"
id="svg11300"
version="1.0"
style="display:inline;enable-background:new"
viewBox="0 0 128 128">
<title
id="title4162">Adwaita Icon Template</title>
<defs
id="defs3">
<linearGradient
id="linearGradient1076">
<stop
style="stop-color:#d5d3cf;stop-opacity:1"
offset="0"
id="stop1064" />
<stop
id="stop1066"
offset="0.03571428"
style="stop-color:#e4e1de;stop-opacity:1" />
<stop
style="stop-color:#d5d3cf;stop-opacity:1"
offset="0.07142857"
id="stop1068" />
<stop
id="stop1070"
offset="0.9285714"
style="stop-color:#d5d3cf;stop-opacity:1" />
<stop
style="stop-color:#e4e1de;stop-opacity:1"
offset="0.96428573"
id="stop1072" />
<stop
style="stop-color:#d5d3cf;stop-opacity:1"
offset="1"
id="stop1074" />
</linearGradient>
<linearGradient
xlink:href="#linearGradient1076"
id="linearGradient1444-2-3-2"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.25,0,0,0.25,-22,109.00903)"
x1="120"
y1="619.96387"
x2="568"
y2="619.96387" />
<linearGradient
xlink:href="#linearGradient985"
id="linearGradient1106-8"
x1="335.86829"
y1="33.559235"
x2="112.13174"
y2="33.559235"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.25,0,0,0.25,-12,225)" />
<linearGradient
id="linearGradient985">
<stop
id="stop981"
offset="0"
style="stop-color:#f9f06b;stop-opacity:1" />
<stop
id="stop983"
offset="1"
style="stop-color:#f9f06b;stop-opacity:0" />
</linearGradient>
<radialGradient
xlink:href="#linearGradient1020"
id="radialGradient1030"
cx="64.846146"
cy="194.19048"
fx="64.846146"
fy="194.19048"
r="44"
gradientTransform="matrix(-4.7272726,1.1058296e-6,-3.0301491e-7,-1.2272727,250.54547,-21.6754)"
gradientUnits="userSpaceOnUse" />
<linearGradient
id="linearGradient1020">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop1016" />
<stop
style="stop-color:#ffffff;stop-opacity:0.09411765"
offset="1"
id="stop1018" />
</linearGradient>
<linearGradient
y2="619.96387"
x2="568"
y1="619.96387"
x1="120"
gradientTransform="matrix(0.25,0,0,0.25,-22.00001,-50.99097)"
gradientUnits="userSpaceOnUse"
id="linearGradient1444-2-3-3"
xlink:href="#linearGradient1076" />
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-4.1363634,1.2532736e-6,-2.6513804e-7,-1.3909091,319.22728,170.63455)"
r="44"
fy="194.19048"
fx="63.999996"
cy="194.19048"
cx="63.999996"
id="radialGradient1030-8"
xlink:href="#linearGradient1020" />
<linearGradient
gradientTransform="matrix(0.25,0,0,0.25,-2.00001,61)"
gradientUnits="userSpaceOnUse"
y2="33.559235"
x2="104"
y1="33.559235"
x1="301"
id="linearGradient1106-2"
xlink:href="#linearGradient985" />
</defs>
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title>GNOME Design Team</dc:title>
</cc:Agent>
</dc:creator>
<dc:source />
<cc:license
rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
<dc:title>Adwaita Icon Template</dc:title>
<dc:subject>
<rdf:Bag />
</dc:subject>
<dc:date />
<dc:rights>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:rights>
<dc:publisher>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:publisher>
<dc:identifier />
<dc:relation />
<dc:language />
<dc:coverage />
<dc:description />
<dc:contributor>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:contributor>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#Notice" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#Attribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#ShareAlike" />
</cc:License>
</rdf:RDF>
</metadata>
<rect
style="display:inline;opacity:1;vector-effect:none;fill:#f6f5f4;fill-opacity:1;stroke:none;stroke-width:0.01129821px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
id="rect929-36-9-9"
width="112"
height="86"
x="8"
y="28"
rx="7.9999995"
ry="7.999999" />
<rect
rx="3.9999998"
style="display:inline;opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:0.01129821px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
id="rect946-0-7-4"
width="92"
height="76"
x="12"
y="32"
ry="4" />
<path
style="display:inline;opacity:1;vector-effect:none;fill:url(#linearGradient1444-2-3-3);fill-opacity:1;stroke:none;stroke-width:0.01129821px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
d="m 7.99999,104 v 4 c 0,4.432 3.568,8 8,8 h 96 c 4.432,0 8,-3.568 8,-8 v -4 c 0,4.432 -3.568,8 -8,8 h -96 c -4.432,0 -8,-3.568 -8,-8 z"
id="rect929-3-6-3-9" />
<rect
y="-104"
x="16"
height="68"
width="84"
id="rect968-2"
style="display:inline;opacity:0.05;vector-effect:none;fill:url(#radialGradient1030-8);fill-opacity:1;stroke:none;stroke-width:0.01121096px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
transform="scale(1,-1)" />
<path
id="path1092-6-1-3-7-5-5"
style="display:inline;opacity:0.23600003;fill:none;stroke:#e5a50a;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;enable-background:new"
d="m 15.99999,74 h 26 l 10,-23 6,39 8,-16 h 34" />
<path
id="path1092-6-1-3-7-5-1-0"
style="display:inline;opacity:1;fill:none;stroke:url(#linearGradient1106-2);stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;enable-background:new"
d="m 15.99999,74 h 26 l 10,-23 6,39 8,-16 h 6" />
<g
transform="translate(0,-170)"
id="g1063">
<path
style="display:inline;opacity:1;vector-effect:none;fill:#949390;fill-opacity:1;stroke:none;stroke-width:3.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
d="m 115.99999,232 v 4 c 0,2.20914 -1.79086,4 -4,4 -2.20914,0 -4,-1.79086 -4,-4 v -2 l 4,-2 z"
id="path1066" />
<path
id="path1074"
d="m 115.99999,248 v 6 h -4 c -2.216,0 -4,-1.784 -4,-4 v -2 z"
style="display:inline;opacity:1;vector-effect:none;fill:#949390;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" />
<path
id="path1076"
d="m 115.99999,252 v -4 a 4,3.9999998 0 0 0 -4,-4 4,3.9999998 0 0 0 -4,4 4,3.9999998 0 0 0 4,4 z"
style="display:inline;opacity:1;vector-effect:none;fill:#d5d3cf;fill-opacity:1;stroke:none;stroke-width:3.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" />
<ellipse
ry="1.0000002"
rx="1"
cy="250"
cx="-113.99997"
id="ellipse1078"
style="display:inline;opacity:1;vector-effect:none;fill:#68676b;fill-opacity:1;stroke:none;stroke-width:3.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
transform="scale(-1,1)" />
<path
style="display:inline;opacity:1;vector-effect:none;fill:#d5d3cf;fill-opacity:1;stroke:none;stroke-width:3.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
d="m 115.99999,230 v 4 a 4,3.9999998 0 0 1 -4,4 4,3.9999998 0 0 1 -4,-4 4,3.9999998 0 0 1 4,-4 z"
id="path1080" />
<ellipse
transform="scale(-1)"
style="display:inline;opacity:1;vector-effect:none;fill:#68676b;fill-opacity:1;stroke:none;stroke-width:3.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
id="ellipse1082"
cx="-113.99997"
cy="-232"
rx="1"
ry="1.0000002" />
<path
id="path1084"
d="m 107.99999,218 v 4 c 0,2.20914 1.79086,4 4,4 2.20914,0 4,-1.79086 4,-4 v -2 l -4,-2 z"
style="display:inline;opacity:1;vector-effect:none;fill:#949390;fill-opacity:1;stroke:none;stroke-width:3.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" />
<path
id="path1086"
d="m 107.99999,216 v 4 a 4,3.9999998 0 0 0 4,4 4,3.9999998 0 0 0 4,-4 4,3.9999998 0 0 0 -4,-4 z"
style="display:inline;opacity:1;vector-effect:none;fill:#d5d3cf;fill-opacity:1;stroke:none;stroke-width:3.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" />
<ellipse
ry="1.0000002"
rx="1"
cy="-218"
cx="109.99997"
id="ellipse1088"
style="display:inline;opacity:1;vector-effect:none;fill:#68676b;fill-opacity:1;stroke:none;stroke-width:3.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
transform="scale(1,-1)" />
<path
style="display:inline;opacity:1;vector-effect:none;fill:#949390;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
d="m 115.99999,206 v 6 h -4 c -2.216,0 -4,-1.784 -4,-4 v -2 z"
id="path1090" />
<path
style="display:inline;opacity:1;vector-effect:none;fill:#d5d3cf;fill-opacity:1;stroke:none;stroke-width:3.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
d="m 115.99999,210 v -4 a 4,3.9999998 0 0 0 -4,-4 4,3.9999998 0 0 0 -4,4 4,3.9999998 0 0 0 4,4 z"
id="path1092" />
<ellipse
transform="scale(-1,1)"
style="display:inline;opacity:1;vector-effect:none;fill:#68676b;fill-opacity:1;stroke:none;stroke-width:3.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
id="ellipse1094"
cx="-113.99997"
cy="208"
rx="1"
ry="1.0000002" />
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
<g font-weight="400" fill="#2e3436">
<path d="M2.188 2C.982 2 0 3.018 0 4.219v7.562C0 12.982.982 14 2.188 14h11.624C15.018 14 16 12.982 16 11.781V4.22C16 3.018 15.018 2 13.812 2zm0 2h11.624c.12 0 .188.08.188.219v7.562c0 .139-.067.219-.188.219H2.188c-.12 0-.188-.08-.188-.219V4.22C2 4.08 2.067 4 2.188 4z" style="line-height:normal;-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none" color="#bebebe" font-family="Bitstream Vera Sans" overflow="visible"/>
<path d="M7.486 5a.5.5 0 0 0-.447.309L5.916 8H3v1h3.25a.5.5 0 0 0 .46-.309l.62-1.488.68 3.395a.5.5 0 0 0 .89.203L10.25 9H13V8h-3a.5.5 0 0 0-.4.2L8.77 9.304l-.78-3.903A.5.5 0 0 0 7.485 5z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal" color="#000" font-family="sans-serif" white-space="normal" overflow="visible"/>
</g>
</svg>
......@@ -6,7 +6,7 @@
<property name="title" translatable="yes">System Monitor</property>
<property name="default_width">440</property>
<property name="default_height">495</property>
<property name="icon_name">utilities-system-monitor</property>
<property name="icon_name">org.gnome.SystemMonitor</property>
<child type="titlebar">
<object class="GtkHeaderBar" id="header_bar">
<property name="visible">True</property>
......@@ -37,6 +37,23 @@
<property name="pack_type">end</property>
</packing>
</child>
<child>
<object class="GtkMenuButton" id="window_menu_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="use_popover">True</property>
<property name="valign">center</property>
<property name="halign">end</property>
<property name="direction">none</property>
<accelerator key="F10" signal="clicked"/>
<style>
<class name="title-button"/>
</style>
</object>
<packing>
<property name="pack_type">end</property>
</packing>
</child>
<child>
<object class="GtkToggleButton" id="search_button">
<property name="visible">True</property>
......
<?xml version="1.0"?>
<interface>
<menu id="app-menu">
<menu id="generic-window-menu">
<section>
<item>
<attribute name="label" translatable="yes" context="Menu item to Open Search for Open Files dialog">Search for Open Files</attribute>
......@@ -12,22 +12,15 @@
<attribute name="label" translatable="yes">Preferences</attribute>
<attribute name="action">app.preferences</attribute>
</item>
</section>
<section>
<item>
<attribute name="label" translatable="yes">Help</attribute>
<attribute name="action">app.help</attribute>
<attribute name="accel">F1</attribute>
</item>
<item>
<attribute name="label" translatable="yes">About</attribute>
<attribute name="label" translatable="yes">About System Monitor</attribute>
<attribute name="action">win.about</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Quit</attribute>
<attribute name="action">app.quit</attribute>
<attribute name="accel">&lt;Primary&gt;q</attribute>
</item>
</section>
</menu>
<menu id="process-window-menu">
......@@ -57,11 +50,32 @@
</section>
<section>
<item>
<attribute name="label" translatable="yes">_Dependencies</attribute>
<attribute name="label" translatable="yes">Show _Dependencies</attribute>
<attribute name="action">win.show-dependencies</attribute>
<attribute name="accel">&lt;Primary&gt;d</attribute>
</item>
</section>
<section>
<item>
<attribute name="label" translatable="yes" context="Menu item to Open Search for Open Files dialog">Search for Open Files</attribute>
<attribute name="action">app.lsof</attribute>
</item>
</section>
<section>
<item>
<attribute name="label" translatable="yes">Preferences</attribute>
<attribute name="action">app.preferences</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Help</attribute>
<attribute name="action">app.help</attribute>
<attribute name="accel">F1</attribute>
</item>
<item>
<attribute name="label" translatable="yes">About System Monitor</attribute>
<attribute name="action">win.about</attribute>
</item>
</section>
</menu>
<menu id="process-popup-menu">
<section>
......
subdir('icons')
......@@ -4,7 +4,7 @@ Comment=View current processes and monitor system state
TryExec=gnome-system-monitor
Exec=gnome-system-monitor
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=utilities-system-monitor
Icon=org.gnome.SystemMonitor
Terminal=false
Type=Application
StartupNotify=true
......
......@@ -4,7 +4,7 @@ Comment=View current processes and monitor system state
TryExec=gnome-system-monitor
Exec=gnome-system-monitor
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=utilities-system-monitor
Icon=org.gnome.SystemMonitor
Terminal=false
Type=Application
StartupNotify=true
......
help/C/figures/monitorlogo.png

28.6 KB | W: | H:

help/C/figures/monitorlogo.png

989 Bytes | W: | H:

help/C/figures/monitorlogo.png
help/C/figures/monitorlogo.png
help/C/figures/monitorlogo.png
help/C/figures/monitorlogo.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -26,7 +26,7 @@
</info>
<title>
<media type="image" src="figures/monitorlogo.png" height="44" its:translate="no" ></media>
<media type="image" src="figures/monitorlogo.png" height="32" its:translate="no" ></media>
System Monitor
</title>
......
......@@ -4,8 +4,8 @@ project('gnome-system-monitor',
default_options : [
'c_std=c11', 'cpp_std=c++11'
],
version: '3.29.2',
meson_version: '>=0.40.0',
version: '3.32.0',
meson_version: '>=0.43.0',
)
......@@ -34,12 +34,14 @@ dataconf.set('pkglibexecdir',
join_paths(get_option('prefix'),get_option('libexecdir'),meson.project_name())
)
prefix = get_option('prefix')
datadir = join_paths(prefix, get_option('datadir'))
################################################################################
# Dependencies
giomm = dependency('giomm-2.4', version: '>=2.46')
glib = dependency('glib-2.0', version: '>=2.55.0')
glib = dependency('glib-2.0', version: '>=2.56.0')
glibmm = dependency('glibmm-2.4', version: '>=2.46')
gmodule = dependency('gmodule-2.0')
gtk3 = dependency('gtk+-3.0', version: '>=3.22.0')
......@@ -85,10 +87,14 @@ extra_cxxflags = [
# '-fvisibility-inlines-hidden',
]
add_project_arguments(cc.get_supported_arguments(extra_flags + extra_cflags),
cflags = extra_flags + extra_cflags
cxxflags = extra_flags + extra_cxxflags
add_project_arguments(cc.get_supported_arguments(cflags),
language: 'c'
)
add_project_arguments(cx.get_supported_arguments(extra_flags + extra_cxxflags),
add_project_arguments(cx.get_supported_arguments(cxxflags),
language: 'cpp'
)
......@@ -173,6 +179,7 @@ endif
rootInclude = include_directories('.')
subdir('data')
subdir('po')
subdir('scripts')
subdir('src')
......@@ -183,11 +190,13 @@ message('\n'.join(['',
'Configuration:',
'',
' Source code location: @0@'.format(meson.source_root()),
' C Compiler: @0@'.format(cc.get_id()),
' C++ Compiler: @0@'.format(cx.get_id()),
' CFLAGS: @0@'.format(get_option('c_args')),
' CXXFLAGS: @0@'.format(get_option('cpp_args')),
' C Compiler: @0@ @1@'.format(cc.get_id(), cc.version()),
' C++ Compiler: @0@ @1@'.format(cx.get_id(), cx.version()),
' CFLAGS: @0@'.format(cflags),
' CXXFLAGS: @0@'.format(cxxflags),
' systemd support: @0@'.format(libsystemd.found()),
' wnck support: @0@ @1@'.format(libwnck.found(),
libwnck.found() ? '(this will likely make system-monitor segfault)' : ''),
]))
meson.add_install_script('meson_post_install.py')
#!/usr/bin/env python3
import os
import subprocess
install_prefix = os.environ['MESON_INSTALL_PREFIX']
icondir = os.path.join(install_prefix, 'share', 'icons', 'hicolor')
schemadir = os.path.join(install_prefix, 'share', 'glib-2.0', 'schemas')
if not os.environ.get('DESTDIR'):
print('Update icon cache...')
subprocess.call(['gtk-update-icon-cache', '-f', '-t', icondir])
print('Compiling gsettings schemas...')
subprocess.call(['glib-compile-schemas', schemadir])
......@@ -5,7 +5,7 @@
<policyconfig>
<vendor>The GNOME Project</vendor>
<vendor_url>http://www.gnome.org/</vendor_url>
<icon_name>utilities-system-monitor</icon_name>
<icon_name>org.gnome.SystemMonitor</icon_name>
<action id="org.gnome.gnome-system-monitor.kill">
<description>Kill process</description>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -217,6 +217,7 @@ GsmApplication::GsmApplication()
stack(NULL),
refresh_button(NULL),
process_menu_button(NULL),
window_menu_button(NULL),
end_process_button(NULL),
search_button(NULL),
search_entry(NULL),
......@@ -390,6 +391,7 @@ void GsmApplication::on_startup()
set_app_menu (menu);
add_accelerator("<Primary>d", "win.show-dependencies", NULL);
add_accelerator("<Primary>q", "app.quit", NULL);
add_accelerator("<Primary>s", "win.send-signal-stop", g_variant_new_int32 (SIGSTOP));
add_accelerator("<Primary>c", "win.send-signal-cont", g_variant_new_int32 (SIGCONT));
add_accelerator("<Primary>e", "win.send-signal-end", g_variant_new_int32 (SIGTERM));
......@@ -399,7 +401,7 @@ void GsmApplication::on_startup()
add_accelerator("<Alt>Return", "win.process-properties", NULL);
add_accelerator("<Primary>f", "win.search", g_variant_new_boolean (TRUE));
Gtk::Window::set_default_icon_name ("utilities-system-monitor");
Gtk::Window::set_default_icon_name ("org.gnome.SystemMonitor");
glibtop_init ();
......
......@@ -205,6 +205,7 @@ public:
GtkStack *stack;
GtkButton *refresh_button;
GtkMenuButton *process_menu_button;
GtkMenuButton *window_menu_button;
GtkButton *end_process_button;
GtkButton *search_button;
GtkSearchEntry *search_entry;
......
......@@ -103,7 +103,7 @@ create_proc_view(GsmApplication *app, GtkBuilder * builder)
g_object_bind_property (app->search_bar, "search-mode-enabled", app->search_button, "active", (GBindingFlags)(G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE));
}
void
static void
cb_cpu_color_changed (GsmColorButton *cp, gpointer data)
{
guint cpu_i = GPOINTER_TO_UINT (data);
......@@ -390,7 +390,7 @@ on_activate_about (GSimpleAction *, GVariant *, gpointer data)
"copyright", "Copyright \xc2\xa9 2001-2004 Kevin Vandersloot\n"
"Copyright \xc2\xa9 2005-2007 Benoît Dejean\n"
"Copyright \xc2\xa9 2011 Chris Kühl",
"logo-icon-name", "utilities-system-monitor",
"logo-icon-name", "org.gnome.SystemMonitor",
"authors", authors,
"artists", artists,
"documenters", documenters,
......@@ -546,7 +546,7 @@ change_priority_state (GSimpleAction *action, GVariant *state, gpointer data)
g_simple_action_set_state (action, state);
}
void
static void
update_page_activities (GsmApplication *app)
{
const char *current_page = gtk_stack_get_visible_child_name (app->stack);
......@@ -560,6 +560,7 @@ update_page_activities (GsmApplication *app)
gtk_widget_show (GTK_WIDGET (app->end_process_button));
gtk_widget_show (GTK_WIDGET (app->search_button));
gtk_widget_show (GTK_WIDGET (app->process_menu_button));
gtk_widget_hide (GTK_WIDGET (app->window_menu_button));
update_sensitivity (app);
......@@ -573,6 +574,7 @@ update_page_activities (GsmApplication *app)
gtk_widget_hide (GTK_WIDGET (app->end_process_button));
gtk_widget_hide (GTK_WIDGET (app->search_button));
gtk_widget_hide (GTK_WIDGET (app->process_menu_button));
gtk_widget_show (GTK_WIDGET (app->window_menu_button));
update_sensitivity (app);
}
......@@ -650,7 +652,7 @@ create_main_window (GsmApplication *app)
{
GtkApplicationWindow *main_window;
GtkStack *stack;
GtkMenuButton *process_menu_button;
GMenuModel *window_menu_model;
GMenuModel *process_menu_model;
GdkDisplay *display;
GdkMonitor *monitor;
......@@ -701,9 +703,13 @@ create_main_window (GsmApplication *app)
if (app->settings->get_boolean (GSM_SETTING_MAXIMIZED))
gtk_window_maximize (GTK_WINDOW (main_window));
app->process_menu_button = process_menu_button = GTK_MENU_BUTTON (gtk_builder_get_object (builder, "process_menu_button"));
app->process_menu_button = GTK_MENU_BUTTON (gtk_builder_get_object (builder, "process_menu_button"));
process_menu_model = G_MENU_MODEL (gtk_builder_get_object (builder, "process-window-menu"));
gtk_menu_button_set_menu_model (process_menu_button, process_menu_model);
gtk_menu_button_set_menu_model (app->process_menu_button, process_menu_model);
app->window_menu_button = GTK_MENU_BUTTON (gtk_builder_get_object (builder, "window_menu_button"));
window_menu_model = G_MENU_MODEL (gtk_builder_get_object (builder, "generic-window-menu"));
gtk_menu_button_set_menu_model (app->window_menu_button, window_menu_model);
app->end_process_button = GTK_BUTTON (gtk_builder_get_object (builder, "end_process_button"));
......@@ -778,7 +784,7 @@ create_main_window (GsmApplication *app)
g_object_unref (G_OBJECT (builder));
}
gboolean
static gboolean
scroll_to_selection (gpointer data)
{
GsmApplication *app = (GsmApplication *) data;
......
......@@ -52,7 +52,7 @@ gsm_tree_view_save_state (GsmTreeView *tree_view)
GtkSortType sort_type;
model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree_view));
g_settings_delay (priv->settings);
if (gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (model),
&sort_col,
&sort_type)) {
......@@ -77,6 +77,8 @@ gsm_tree_view_save_state (GsmTreeView *tree_view)
g_list_free (columns);
}
g_settings_apply (priv->settings);
}
GtkTreeViewColumn *
......@@ -223,6 +225,7 @@ save_column_state (gpointer data)
gboolean visible = gtk_tree_view_column_get_visible (current_column);
gchar *key;
g_settings_delay (settings);
key = g_strdup_printf ("col-%d-width", column_id);
g_settings_set_int (settings, key, width);
......@@ -232,6 +235,8 @@ save_column_state (gpointer data)
g_settings_set_boolean (settings, key, visible);
g_free (key);
timeout_id = 0;
g_settings_apply (settings);
return FALSE;
}
......
......@@ -53,7 +53,7 @@ unsigned LoadGraph::num_bars() const
#define FRAME_WIDTH 4
void draw_background(LoadGraph *graph) {
static void draw_background(LoadGraph *graph) {
GtkAllocation allocation;
cairo_t *cr;
guint i;
......
......@@ -28,22 +28,6 @@
</description>
</key>
<key type="b" name="cpu-stacked-area-chart">
<default>false
</default>
<summary>Show CPU chart as stacked area chart</summary>
<description>If TRUE, system-monitor shows the CPU chart as a stacked area chart instead of a line chart.
</description>
</key>
<key type="b" name="cpu-smooth-graph">
<default>true
</default>
<summary>Show CPU chart as smooth graph using Bezier curves</summary>
<description>If TRUE, system-monitor shows the CPU chart as a smoothed graph, otherwise as a line chart.
</description>
</key>
<key name="smooth-refresh" type="b">
<default>true
</default>
......@@ -150,6 +134,25 @@
</summary>
</key>
<key name="cpu-stacked-area-chart" type="b">
<default>false
</default>
<summary>Show CPU chart as stacked area chart
</summary>
<description>If TRUE, system-monitor shows the CPU chart as a stacked area chart instead of a line chart.
</description>
</key>
<key name="cpu-smooth-graph" type="b">
<default>true
</default>
<summary>Show CPU chart as smooth graph using Bezier curves
</summary>
<description>If TRUE, system-monitor shows the CPU chart as a smoothed graph, otherwise as a line chart.
</description>
</key>
<child name="proctree" schema="org.gnome.gnome-system-monitor.proctree" />
<child name="disktreenew" schema="org.gnome.gnome-system-monitor.disktreenew" />
<child name="memmapstree" schema="org.gnome.gnome-system-monitor.memmapstree" />
......
......@@ -74,7 +74,7 @@ procdialog_create_kill_dialog (GsmApplication *app, int signal)
&selected_process);
std::string *process_name = &selected_process->name;
std::string short_process_name = process_name->substr(0, process_name->find(" "));
std::string short_process_name = process_name->substr(0, process_name->find(" -"));
switch (signal) {
case SIGKILL:
......
......@@ -133,7 +133,7 @@ get_last_selected (GtkTreeModel *model, GtkTreePath *path,
gtk_tree_model_get (model, iter, COL_POINTER, info, -1);
}
void
static void
cb_row_selected (GtkTreeSelection *selection, gpointer data)
{
GsmApplication *app = (GsmApplication *) data;
......@@ -192,15 +192,11 @@ cb_refresh_icons (GtkIconTheme *theme, gpointer data)
{
GsmApplication *app = (GsmApplication *) data;
if(app->timeout) {
g_source_remove (app->timeout);
}
for (auto& v : app->processes) {
app->pretty_table->set_icon(v.second);
}
cb_timeout(app);
proctable_update (app);
}
static gboolean
......