[gnome-system-monitor/ubergraph] Remove unnecessary ubergraph stuff, like heatmap, scatter and uberwindow



commit 226d9072d617b7cb76fc4f4b615928fcb14f36d9
Author: Robert Roth <robert roth off gmail com>
Date:   Sat Oct 12 06:37:10 2013 +0300

    Remove unnecessary ubergraph stuff, like heatmap, scatter and uberwindow

 src/system-monitor.c |   11 +-
 uber/Makefile.am     |    6 -
 uber/uber-heat-map.c |  349 -----------------------------------------
 uber/uber-heat-map.h |   66 --------
 uber/uber-scatter.c  |  422 --------------------------------------------------
 uber/uber-scatter.h  |   66 --------
 uber/uber-window.c   |  305 ------------------------------------
 uber/uber-window.h   |   65 --------
 uber/uber.h          |    3 -
 9 files changed, 8 insertions(+), 1285 deletions(-)
---
diff --git a/src/system-monitor.c b/src/system-monitor.c
index 9223bcf..19591ae 100644
--- a/src/system-monitor.c
+++ b/src/system-monitor.c
@@ -55,6 +55,7 @@ main (gint   argc,   /* IN */
        UberRange cpu_range = { 0., 100., 100. };
        UberRange net_range = { 0., 512., 512. };
        GtkWidget *window;
+    GtkWidget *container;
        GtkWidget *cpu;
        GtkWidget *net;
        GtkWidget *label;
@@ -78,7 +79,10 @@ main (gint   argc,   /* IN */
        /*
         * Create window and graphs.
         */
-       window = uber_window_new();
+       window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    container = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
+    gtk_container_add(GTK_CONTAINER(window), container);
+    
        cpu = uber_line_graph_new();
        net = uber_line_graph_new();
        /*
@@ -134,8 +138,8 @@ main (gint   argc,   /* IN */
        /*
         * Add graphs.
         */
-       uber_window_add_graph(UBER_WINDOW(window), UBER_GRAPH(cpu), "CPU");
-       uber_window_add_graph(UBER_WINDOW(window), UBER_GRAPH(net), "Network");
+       gtk_box_pack_start(GTK_BOX(container), GTK_WIDGET(cpu), TRUE, TRUE, 6);
+       gtk_box_pack_start(GTK_BOX(container), GTK_WIDGET(net), TRUE, TRUE, 6);
        /*
         * Disable X tick labels by default (except last).
         */
@@ -146,6 +150,7 @@ main (gint   argc,   /* IN */
         */
        gtk_widget_show(net);
        gtk_widget_show(cpu);
+    gtk_widget_show(container);
        gtk_widget_show(window);
        /*
         * Show cpu labels by default.
diff --git a/uber/Makefile.am b/uber/Makefile.am
index 0333050..17682c4 100644
--- a/uber/Makefile.am
+++ b/uber/Makefile.am
@@ -5,16 +5,13 @@ INST_H_FILES =                                \
        uber.h                  \
        uber-graph.h            \
        uber-frame-source.h     \
-       uber-heat-map.h         \
        uber-line-graph.h               \
        uber-label.h            \
        uber-range.h            \
        uber-scale.h            \
-       uber-scatter.h          \
        uber-timeout-interval.h
 
 NOINST_H_FILES =                       \
-       uber-window.h           \
        g-ring.h
 
 libuber_1_0_la_SOURCES =               \
@@ -22,14 +19,11 @@ libuber_1_0_la_SOURCES =            \
        $(NOINST_H_FILES)               \
        uber-graph.c            \
        uber-frame-source.c     \
-       uber-heat-map.c         \
        uber-line-graph.c               \
        uber-label.c            \
        uber-range.c            \
        uber-scale.c            \
-       uber-scatter.c          \
        uber-timeout-interval.c \
-       uber-window.c           \
        g-ring.c
 
 libuber_1_0_la_CFLAGS =
diff --git a/uber/uber.h b/uber/uber.h
index b101dfd..f539291 100644
--- a/uber/uber.h
+++ b/uber/uber.h
@@ -21,10 +21,7 @@
 
 #include "uber-graph.h"
 #include "uber-line-graph.h"
-#include "uber-heat-map.h"
 #include "uber-range.h"
-#include "uber-scatter.h"
 #include "uber-scale.h"
-#include "uber-window.h"
 
 #endif /* __UBER_H__ */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]