[gnome-system-monitor/wip/procdialog: 102/102] Merge remote-tracking branch 'origin' into wip/procdialog
- From: Robert Roth <robertroth src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-system-monitor/wip/procdialog: 102/102] Merge remote-tracking branch 'origin' into wip/procdialog
- Date: Fri, 28 Mar 2014 07:24:46 +0000 (UTC)
commit b78a99bc0c0775efd4f20d7f48ed45e3936a74d9
Merge: c261d58 96fb1aa
Author: Robert Roth <robert roth off gmail com>
Date: Fri Mar 28 09:24:07 2014 +0200
Merge remote-tracking branch 'origin' into wip/procdialog
.gitignore | 79 -
Makefile.am | 8 +
NEWS | 53 +
configure.ac | 2 +-
data/interface.ui | 28 +-
data/preferences.ui | 15 -
git.mk | 319 ++
gnome-system-monitor.appdata.xml.in | 8 +-
help/C/commandline.page | 72 +
help/C/cpu-check.page | 31 +
help/C/cpu-mem-normal.page | 35 +
help/C/cpu-multicore.page | 27 +
help/C/figures/gnome-system-monitor_window.png | Bin 88522 -> 0 bytes
help/C/fs-device.page | 31 +
help/C/fs-diskusage.page | 43 +
help/C/fs-info.page | 47 +
help/C/fs-showall.page | 27 +
help/C/index.docbook | 1186 -------
help/C/index.page | 50 +
help/C/legal.xml | 80 +-
help/C/mem-check.page | 97 +
help/C/mem-swap.page | 60 +
help/C/memory-map-use.page | 174 +
help/C/memory-map-what.page.stub | 79 +
help/C/net-bits.page | 45 +
help/C/net-check.page | 58 +
help/C/process-columns.page | 42 +
help/C/process-explain.page | 45 +
help/C/process-files.page | 31 +
help/C/process-forcequit.page | 36 +
help/C/process-identify-file.page | 55 +
help/C/process-identify-hog.page | 62 +
help/C/process-kill.page | 29 +
help/C/process-loadaverage.page.stub | 50 +
help/C/process-many.page | 23 +
help/C/process-priority-change.page | 45 +
help/C/process-priority-what.page | 36 +
help/C/process-status.page | 64 +
help/C/process-update-speed.page | 53 +
help/C/solaris-mode.page | 51 +
help/C/units.page | 48 +
help/Makefile.am | 35 +-
help/ar/ar.po | 1697 ----------
help/ar/figures/gnome-system-monitor_window.png | Bin 72186 -> 0 bytes
help/bg/bg.po | 1831 -----------
help/bg/figures/gnome-system-monitor_window.png | Bin 88066 -> 0 bytes
help/ca/ca.po | 2053 ------------
help/ca/figures/gnome-system-monitor_window.png | Bin 83797 -> 0 bytes
help/cs/cs.po | 1559 ---------
help/cs/figures/gnome-system-monitor_window.png | Bin 98878 -> 0 bytes
help/da/da.po | 1798 ----------
help/de/de.po | 1677 ----------
help/de/figures/gnome-system-monitor_window.png | Bin 78868 -> 0 bytes
help/el/el.po | 3471 ++++++++++----------
help/el/figures/gnome-system-monitor_window.png | Bin 94370 -> 0 bytes
help/es/es.po | 3330 +++++++++----------
help/es/figures/gnome-system-monitor_window.png | Bin 54608 -> 0 bytes
help/eu/eu.po | 1804 ----------
help/eu/figures/gnome-system-monitor_window.png | Bin 70925 -> 0 bytes
help/fr/figures/gnome-system-monitor_window.png | Bin 98173 -> 0 bytes
help/fr/fr.po | 3175 ++++++++++---------
help/gl/gl.po | 1739 ----------
help/ja/ja.po | 1032 ------
help/oc/oc.po | 1452 --------
help/pa/pa.po | 1492 ---------
help/pt_BR/figures/gnome-system-monitor_window.png | Bin 112704 -> 0 bytes
help/pt_BR/pt_BR.po | 1589 ---------
help/ru/ru.po | 1796 ----------
help/sl/sl.po | 1225 -------
help/sv/figures/gnome-system-monitor_window.png | Bin 126339 -> 0 bytes
help/sv/sv.po | 1408 --------
help/zh_CN/figures/gnome-system-monitor_window.png | Bin 90178 -> 0 bytes
help/zh_CN/zh_CN.po | 1627 ---------
org.gnome.gnome-system-monitor.policy.in.in | 4 +-
po/LINGUAS | 1 +
po/fi.po | 315 +-
po/gd.po | 1549 +++++++++
po/kn.po | 339 +--
po/nb.po | 236 +-
po/nl.po | 1250 ++++----
po/pt_BR.po | 19 +-
po/zh_HK.po | 189 +-
po/zh_TW.po | 189 +-
scripts/Makefile.am | 2 +
src/Makefile.am | 2 +
src/application.cpp | 18 +-
src/application.h | 1 +
src/gsm_color_button.c | 3 +-
src/gsm_color_button.h | 3 +-
src/interface.cpp | 68 +-
src/interface.h | 3 +-
src/load-graph.cpp | 36 +-
src/main.cpp | 3 +-
src/prefsdialog.cpp | 16 +-
src/procactions.cpp | 3 +-
src/procactions.h | 3 +-
src/procdialogs.cpp | 3 +-
src/procdialogs.h | 3 +-
src/procproperties.cpp | 9 +-
src/procproperties.h | 3 +-
src/proctable.cpp | 20 +-
src/proctable.h | 3 +-
102 files changed, 9925 insertions(+), 33482 deletions(-)
---
diff --cc src/proctable.cpp
index 06e9793,7f97cd3..f6e401c
--- a/src/proctable.cpp
+++ b/src/proctable.cpp
@@@ -303,28 -302,12 +303,29 @@@ static voi
cb_show_whose_processes_changed (GSettings *settings, const gchar *key, gpointer data)
{
GsmApplication *app = (GsmApplication *) data;
-
- proctable_clear_tree (app);
- proctable_update (app);
+ if (app->timeout) {
+ proctable_clear_tree (app);
+ proctable_update (app);
+ }
}
+static void
+cb_proctree_double_clicked (GtkTreeView* tree_view,
+ GtkTreePath* path,
+ GtkTreeViewColumn* column,
+ GsmApplication* app)
+{
+ GtkTreeIter iter;
+ GtkTreeModel *model = gtk_tree_view_get_model (tree_view);
+ if (gtk_tree_model_get_iter (model, &iter, path)) {
+ gchar *name;
+ gpointer info;
+ gtk_tree_model_get (model, &iter, COL_NAME, &name, COL_POINTER, &info, -1);
+ create_simple_procproperties_dialog (app, (ProcInfo*)info);
+ g_free (name);
+ }
+}
+
GtkWidget *
proctable_new (GsmApplication * const app)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
