[gnome-system-monitor/wip-charts: 170/170] Merge branch 'master' into wip-charts
- From: Robert Roth <robertroth src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-system-monitor/wip-charts: 170/170] Merge branch 'master' into wip-charts
- Date: Fri, 6 Nov 2020 16:34:20 +0000 (UTC)
commit e5a0349cae4910559d5853131f3f9fb685a42600
Merge: 4bcf0a8f 28671d97
Author: Robert Roth <robert roth off gmail com>
Date: Fri Nov 6 18:34:08 2020 +0200
Merge branch 'master' into wip-charts
HACKING | 13 +-
NEWS | 135 ++
README | 16 -
README.md | 52 +
data/help-overlay.ui | 144 ++
.../apps/org.gnome.SystemMonitor.Devel.svg | 1 +
data/interface.ui | 537 ++---
data/menus.ui | 23 +-
data/preferences.ui | 54 +-
help/C/memory-map-use.page | 2 +-
...ory-map-what.page.stub => memory-map-what.page} | 2 +-
help/LINGUAS | 5 +
help/ca/ca.po | 1930 ++++++++++++++++++
help/cs/cs.po | 8 +-
help/da/da.po | 1884 +++++++++++++++++
help/de/de.po | 4 +-
help/es/es.po | 25 +-
help/id/.gitkeep | 0
help/id/id.po | 2125 ++++++++++++++++++++
help/meson.build | 2 +
help/pl/pl.po | 4 +-
help/ru/ru.po | 1863 +++++++++++++++++
help/sv/sv.po | 12 +-
help/uk/uk.po | 2101 +++++++++++++++++++
meson.build | 9 +-
po/POTFILES.in | 2 +
po/ca.po | 416 ++--
po/cs.po | 346 ++--
po/da.po | 461 ++---
po/de.po | 365 ++--
po/el.po | 361 ++--
po/en_GB.po | 599 +++---
po/eo.po | 337 ++--
po/es.po | 371 ++--
po/eu.po | 495 ++---
po/fa.po | 412 ++--
po/fi.po | 359 ++--
po/fr.po | 357 ++--
po/fur.po | 355 ++--
po/gl.po | 648 ++----
po/he.po | 1167 ++++++-----
po/hr.po | 341 ++--
po/hu.po | 356 ++--
po/id.po | 363 ++--
po/it.po | 351 ++--
po/its/polkit.its | 8 +
po/its/polkit.loc | 6 +
po/ja.po | 276 +--
po/kk.po | 365 ++--
po/ko.po | 395 ++--
po/lt.po | 359 ++--
po/lv.po | 363 ++--
po/ms.po | 1886 +++++++++++++----
po/nl.po | 367 ++--
po/pl.po | 417 ++--
po/pt.po | 1001 ++++-----
po/pt_BR.po | 365 ++--
po/ro.po | 363 ++--
po/sk.po | 349 ++--
po/sl.po | 365 ++--
po/sr.po | 368 ++--
po/sv.po | 367 ++--
po/tr.po | 357 ++--
po/uk.po | 1033 ++++------
po/zh_CN.po | 343 ++--
po/zh_TW.po | 375 ++--
scripts/meson.build | 1 +
src/application.cpp | 45 +-
src/application.h | 6 +-
src/disks.cpp | 21 +-
src/gsm.gresource.xml | 1 +
src/interface.cpp | 67 +-
src/legacy/gsm_color_button.c | 4 +-
src/load-graph.cpp | 338 +++-
src/load-graph.h | 19 +-
src/memmaps.cpp | 5 +
src/meson.build | 2 +
src/openfiles.cpp | 2 +-
src/org.gnome.gnome-system-monitor.gschema.xml.in | 14 +-
src/prefsdialog.cpp | 40 +-
src/procdialogs.cpp | 21 +
src/procdialogs.h | 9 +-
src/procproperties.cpp | 2 +-
src/proctable.cpp | 74 +-
src/setaffinity.cpp | 473 +++++
src/setaffinity.h | 21 +
src/settings-keys.h | 4 +
src/util.cpp | 148 +-
src/util.h | 13 +-
89 files changed, 21130 insertions(+), 9341 deletions(-)
---
diff --cc meson.build
index cc7ef8bb,19fa48d1..42299ad9
--- a/meson.build
+++ b/meson.build
@@@ -49,9 -49,7 +49,8 @@@ gtkmm = dependency('gtkmm-3.0', ver
libgtop = dependency('libgtop-2.0', version: '>=2.37.0')
librsvg = dependency('librsvg-2.0', version: '>=2.35')
libxml = dependency('libxml-2.0', version: '>=2.0')
+libdazzle = dependency('libdazzle-1.0', version: '>=3.26.3')
-
if get_option('wnck')
libwnck = dependency('libwnck-3.0', version: '>=2.91.0')
else
diff --cc src/interface.cpp
index 524a2f2b,8f25555d..d5c7856d
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@@ -215,13 -218,13 +232,15 @@@ create_sys_view (GsmApplication *app, G
/* The CPU BOX */
cpu_graph_box = GTK_BOX (gtk_builder_get_object (builder, "cpu_graph_box"));
+ cpu_expander = GTK_EXPANDER (gtk_builder_get_object (builder, "cpu_expander"));
+ g_object_bind_property (cpu_expander, "expanded", cpu_expander, "vexpand", G_BINDING_DEFAULT);
- cpu_graph = new LoadGraph(LOAD_GRAPH_CPU);
- gtk_widget_set_size_request (GTK_WIDGET(load_graph_get_widget(cpu_graph)), -1, 70);
+ dzl_graph = GTK_WIDGET(g_object_new (DZL_TYPE_CPU_GRAPH, "timespan", G_TIME_SPAN_MINUTE,
+ "max-samples", 60, NULL));
+ gtk_widget_set_size_request (GTK_WIDGET(dzl_graph), -1, 70);
+ gtk_widget_show (dzl_graph);
gtk_box_pack_start (cpu_graph_box,
- GTK_WIDGET (load_graph_get_widget(cpu_graph)),
+ GTK_WIDGET (dzl_graph),
TRUE,
TRUE,
0);
@@@ -267,9 -272,14 +288,11 @@@
}
- app->cpu_graph = cpu_graph;
-
/** The memory box */
-
+
mem_graph_box = GTK_BOX (gtk_builder_get_object (builder, "mem_graph_box"));
+ mem_expander = GTK_EXPANDER (gtk_builder_get_object (builder, "mem_expander"));
+ g_object_bind_property (mem_expander, "expanded", mem_expander, "vexpand", G_BINDING_DEFAULT);
mem_graph = new LoadGraph(LOAD_GRAPH_MEM);
gtk_widget_set_size_request (GTK_WIDGET(load_graph_get_widget(mem_graph)), -1, 70);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
