Make indentation uniform across source files

No more tabs, 4 spaces instead. And remove trailing whitespace.

1 files changed, 638 insertions, 638 deletions

diff --git a/src/interface.cpp b/src/interface.cpp
index a609c7c..405f1e3 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -41,58 +41,58 @@
 #include "sysinfo.h"
 #include "gsm_color_button.h"
 
-static void	cb_toggle_tree (GtkAction *action, gpointer data);
-static void	cb_proc_goto_tab (gint tab);
+static void    cb_toggle_tree (GtkAction *action, gpointer data);
+static void    cb_proc_goto_tab (gint tab);
 
 static const GtkActionEntry menu_entries[] =
 {
-	// xgettext: noun, top level menu.
-	// "File" did not make sense for system-monitor
-	{ "Monitor", NULL, N_("_Monitor") },
-	{ "Edit", NULL, N_("_Edit") },
-	{ "View", NULL, N_("_View") },
-	{ "Help", NULL, N_("_Help") },
-
-	{ "Lsof", GTK_STOCK_FIND, N_("Search for _Open Files"), "<control>O",
-	  N_("Search for open files"), G_CALLBACK(cb_show_lsof) },
-	{ "Quit", GTK_STOCK_QUIT, NULL, NULL,
-	  N_("Quit the program"), G_CALLBACK (cb_app_exit) },
-
-
-	{ "StopProcess", NULL, N_("_Stop Process"), "<control>S",
-	  N_("Stop process"), G_CALLBACK(cb_kill_sigstop) },
-	{ "ContProcess", NULL, N_("_Continue Process"), "<control>C",
-	  N_("Continue process if stopped"), G_CALLBACK(cb_kill_sigcont) },
-
-	{ "EndProcess", NULL, N_("_End Process"), "<control>E",
-	  N_("Force process to finish normally"), G_CALLBACK (cb_end_process) },
-	{ "KillProcess", NULL, N_("_Kill Process"), "<control>K",
-	  N_("Force process to finish immediately"), G_CALLBACK (cb_kill_process) },
-	{ "ChangePriority", NULL, N_("_Change Priority..."), "<control>N",
-	  N_("Change the order of priority of process"), G_CALLBACK (cb_renice) },
-	{ "Preferences", GTK_STOCK_PREFERENCES, NULL, NULL,
-	  N_("Configure the application"), G_CALLBACK (cb_edit_preferences) },
-
-	{ "Refresh", GTK_STOCK_REFRESH, N_("_Refresh"), "<control>R",
-	  N_("Refresh the process list"), G_CALLBACK(cb_user_refresh) },
-
-	{ "MemoryMaps", NULL, N_("_Memory Maps"), "<control>M",
-	  N_("Open the memory maps associated with a process"), G_CALLBACK (cb_show_memory_maps) },
-	// Translators: this means 'Files that are open' (open is no verb here
-	{ "OpenFiles", NULL, N_("Open _Files"), "<control>F",
-	  N_("View the files opened by a process"), G_CALLBACK (cb_show_open_files) },
-
-	{ "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1",
-	  N_("Open the manual"), G_CALLBACK (cb_help_contents) },
-	{ "About", GTK_STOCK_ABOUT, NULL, NULL,
-	  N_("About this application"), G_CALLBACK (cb_about) }
+    // xgettext: noun, top level menu.
+    // "File" did not make sense for system-monitor
+    { "Monitor", NULL, N_("_Monitor") },
+    { "Edit", NULL, N_("_Edit") },
+    { "View", NULL, N_("_View") },
+    { "Help", NULL, N_("_Help") },
+
+    { "Lsof", GTK_STOCK_FIND, N_("Search for _Open Files"), "<control>O",
+      N_("Search for open files"), G_CALLBACK(cb_show_lsof) },
+    { "Quit", GTK_STOCK_QUIT, NULL, NULL,
+      N_("Quit the program"), G_CALLBACK (cb_app_exit) },
+
+
+    { "StopProcess", NULL, N_("_Stop Process"), "<control>S",
+      N_("Stop process"), G_CALLBACK(cb_kill_sigstop) },
+    { "ContProcess", NULL, N_("_Continue Process"), "<control>C",
+      N_("Continue process if stopped"), G_CALLBACK(cb_kill_sigcont) },
+
+    { "EndProcess", NULL, N_("_End Process"), "<control>E",
+      N_("Force process to finish normally"), G_CALLBACK (cb_end_process) },
+    { "KillProcess", NULL, N_("_Kill Process"), "<control>K",
+      N_("Force process to finish immediately"), G_CALLBACK (cb_kill_process) },
+    { "ChangePriority", NULL, N_("_Change Priority..."), "<control>N",
+      N_("Change the order of priority of process"), G_CALLBACK (cb_renice) },
+    { "Preferences", GTK_STOCK_PREFERENCES, NULL, NULL,
+      N_("Configure the application"), G_CALLBACK (cb_edit_preferences) },
+
+    { "Refresh", GTK_STOCK_REFRESH, N_("_Refresh"), "<control>R",
+      N_("Refresh the process list"), G_CALLBACK(cb_user_refresh) },
+
+    { "MemoryMaps", NULL, N_("_Memory Maps"), "<control>M",
+      N_("Open the memory maps associated with a process"), G_CALLBACK (cb_show_memory_maps) },
+    // Translators: this means 'Files that are open' (open is no verb here
+    { "OpenFiles", NULL, N_("Open _Files"), "<control>F",
+      N_("View the files opened by a process"), G_CALLBACK (cb_show_open_files) },
+
+    { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1",
+      N_("Open the manual"), G_CALLBACK (cb_help_contents) },
+    { "About", GTK_STOCK_ABOUT, NULL, NULL,
+      N_("About this application"), G_CALLBACK (cb_about) }
 };
 
 static const GtkToggleActionEntry toggle_menu_entries[] =
 {
-	{ "ShowDependencies", NULL, N_("_Dependencies"), "<control>D",
-	  N_("Show parent/child relationship between processes"),
-	  G_CALLBACK (cb_toggle_tree), TRUE },
+    { "ShowDependencies", NULL, N_("_Dependencies"), "<control>D",
+      N_("Show parent/child relationship between processes"),
+      G_CALLBACK (cb_toggle_tree), TRUE },
 };
 
 
@@ -158,418 +158,418 @@ static const char ui_info[] =
 static GtkWidget *
 create_proc_view (ProcData *procdata)
 {
-	GtkWidget *vbox1;
-	GtkWidget *hbox1;
-	GtkWidget *scrolled;
-	GtkWidget *hbox2;
-	char* string;
-
-	vbox1 = gtk_vbox_new (FALSE, 18);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox1), 12);
-	
-	hbox1 = gtk_hbox_new (FALSE, 12);
-	gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
-
-	string = make_loadavg_string ();
-	procdata->loadavg = gtk_label_new (string);
-	g_free (string);
-	gtk_box_pack_start (GTK_BOX (hbox1), procdata->loadavg, FALSE, FALSE, 0);
-
-
-	scrolled = proctable_new (procdata);
-	if (!scrolled)
-		return NULL;
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled),
-                                             GTK_SHADOW_IN);
-
-	gtk_box_pack_start (GTK_BOX (vbox1), scrolled, TRUE, TRUE, 0);
-	
-	
-	hbox2 = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox1), hbox2, FALSE, FALSE, 0);
-	
-	procdata->endprocessbutton = gtk_button_new_with_mnemonic (_("End _Process"));
-	gtk_box_pack_end (GTK_BOX (hbox2), procdata->endprocessbutton, FALSE, FALSE, 0);
-	g_signal_connect (G_OBJECT (procdata->endprocessbutton), "clicked",
-			  G_CALLBACK (cb_end_process_button_pressed), procdata);
-	
-	
-	/* create popup_menu */
- 	procdata->popup_menu = gtk_ui_manager_get_widget (procdata->uimanager, "/PopupMenu");
-
-        return vbox1;
+    GtkWidget *vbox1;
+    GtkWidget *hbox1;
+    GtkWidget *scrolled;
+    GtkWidget *hbox2;
+    char* string;
+
+    vbox1 = gtk_vbox_new (FALSE, 18);
+    gtk_container_set_border_width (GTK_CONTAINER (vbox1), 12);
+
+    hbox1 = gtk_hbox_new (FALSE, 12);
+    gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+    string = make_loadavg_string ();
+    procdata->loadavg = gtk_label_new (string);
+    g_free (string);
+    gtk_box_pack_start (GTK_BOX (hbox1), procdata->loadavg, FALSE, FALSE, 0);
+
+
+    scrolled = proctable_new (procdata);
+    if (!scrolled)
+        return NULL;
+    gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled),
+                                         GTK_SHADOW_IN);
+
+    gtk_box_pack_start (GTK_BOX (vbox1), scrolled, TRUE, TRUE, 0);
+
+
+    hbox2 = gtk_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox1), hbox2, FALSE, FALSE, 0);
+
+    procdata->endprocessbutton = gtk_button_new_with_mnemonic (_("End _Process"));
+    gtk_box_pack_end (GTK_BOX (hbox2), procdata->endprocessbutton, FALSE, FALSE, 0);
+    g_signal_connect (G_OBJECT (procdata->endprocessbutton), "clicked",
+                      G_CALLBACK (cb_end_process_button_pressed), procdata);
+
+
+    /* create popup_menu */
+     procdata->popup_menu = gtk_ui_manager_get_widget (procdata->uimanager, "/PopupMenu");
+
+    return vbox1;
 }
 
 
 GtkWidget *
 make_title_label (const char *text)
 {
-  GtkWidget *label;
-  char *full;
+    GtkWidget *label;
+    char *full;
 
-  full = g_strdup_printf ("<span weight=\"bold\">%s</span>", text);
-  label = gtk_label_new (full);
-  g_free (full);
+    full = g_strdup_printf ("<span weight=\"bold\">%s</span>", text);
+    label = gtk_label_new (full);
+    g_free (full);
 
-  gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
-  gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+    gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
 
-  return label;
+    return label;
 }
 
 
 static GtkWidget *
 create_sys_view (ProcData *procdata)
 {
-	GtkWidget *vbox, *hbox;
-	GtkWidget *cpu_box, *mem_box, *net_box;
-	GtkWidget *cpu_graph_box, *mem_graph_box, *net_graph_box;
-	GtkWidget *label,*cpu_label, *spacer;
-	GtkWidget *table;
-	GtkWidget *color_picker;
-	GtkWidget *mem_legend_box, *net_legend_box;
-	LoadGraph *cpu_graph, *mem_graph, *net_graph;
-	gint i;
-
-
-	vbox = gtk_vbox_new (FALSE, 18);
-
-	gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
-
-	/* The CPU BOX */
-
-	cpu_box = gtk_vbox_new (FALSE, 6);
-	gtk_box_pack_start (GTK_BOX (vbox), cpu_box, TRUE, TRUE, 0);
-
-	label = make_title_label (_("CPU History"));
-	gtk_box_pack_start (GTK_BOX (cpu_box), label, FALSE, FALSE, 0);
-
-	cpu_graph_box = gtk_vbox_new (FALSE, 6);
-	gtk_box_pack_start (GTK_BOX (cpu_box), cpu_graph_box, TRUE, TRUE, 0);
-
-	cpu_graph = new LoadGraph(LOAD_GRAPH_CPU);
-	gtk_box_pack_start (GTK_BOX (cpu_graph_box),
-			    load_graph_get_widget(cpu_graph),
-			    TRUE,
-			    TRUE,
-			    0);
-
-	hbox = gtk_hbox_new(FALSE, 0);
-	spacer = gtk_label_new ("");
-	gtk_widget_set_size_request(GTK_WIDGET(spacer), 57, -1);
-	gtk_box_pack_start (GTK_BOX (hbox), spacer, 
-			    FALSE, FALSE, 0);
-
-
-	gtk_box_pack_start (GTK_BOX (cpu_graph_box), hbox, 
-			    FALSE, FALSE, 0);
-
-	/*cpu_legend_box = gtk_hbox_new(TRUE, 10);
-	gtk_box_pack_start (GTK_BOX (hbox), cpu_legend_box, 
-			    TRUE, TRUE, 0);*/
-
-	GtkWidget* cpu_table = gtk_table_new(std::min(procdata->config.num_cpus / 4, 1),
-					     std::min(procdata->config.num_cpus, 4),
-					     TRUE);
-	gtk_table_set_row_spacings(GTK_TABLE(cpu_table), 6);
-	gtk_table_set_col_spacings(GTK_TABLE(cpu_table), 6);
-	gtk_box_pack_start(GTK_BOX(hbox), cpu_table, TRUE, TRUE, 0);
-
-	for (i=0;i<procdata->config.num_cpus; i++) {
-		GtkWidget *temp_hbox;
-		gchar *text;
-		
-		temp_hbox = gtk_hbox_new (FALSE, 0);
-		gtk_table_attach(GTK_TABLE(cpu_table), temp_hbox,
-				 i % 4, i % 4 + 1,
-				 i / 4, i / 4 + 1,
-				 static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), 
-				 static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL),
-				 0, 0);
-		//gtk_size_group_add_widget (sizegroup, temp_hbox);
-		/*g_signal_connect (G_OBJECT (temp_hbox), "size_request",
-					 G_CALLBACK(size_request), &cpu_size);
+    GtkWidget *vbox, *hbox;
+    GtkWidget *cpu_box, *mem_box, *net_box;
+    GtkWidget *cpu_graph_box, *mem_graph_box, *net_graph_box;
+    GtkWidget *label,*cpu_label, *spacer;
+    GtkWidget *table;
+    GtkWidget *color_picker;
+    GtkWidget *mem_legend_box, *net_legend_box;
+    LoadGraph *cpu_graph, *mem_graph, *net_graph;
+    gint i;
+
+
+    vbox = gtk_vbox_new (FALSE, 18);
+
+    gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
+
+    /* The CPU BOX */
+
+    cpu_box = gtk_vbox_new (FALSE, 6);
+    gtk_box_pack_start (GTK_BOX (vbox), cpu_box, TRUE, TRUE, 0);
+
+    label = make_title_label (_("CPU History"));
+    gtk_box_pack_start (GTK_BOX (cpu_box), label, FALSE, FALSE, 0);
+
+    cpu_graph_box = gtk_vbox_new (FALSE, 6);
+    gtk_box_pack_start (GTK_BOX (cpu_box), cpu_graph_box, TRUE, TRUE, 0);
+
+    cpu_graph = new LoadGraph(LOAD_GRAPH_CPU);
+    gtk_box_pack_start (GTK_BOX (cpu_graph_box),
+                        load_graph_get_widget(cpu_graph),
+                        TRUE,
+                        TRUE,
+                         0);
+
+    hbox = gtk_hbox_new(FALSE, 0);
+    spacer = gtk_label_new ("");
+    gtk_widget_set_size_request(GTK_WIDGET(spacer), 57, -1);
+    gtk_box_pack_start (GTK_BOX (hbox), spacer,
+                        FALSE, FALSE, 0);
+
+
+    gtk_box_pack_start (GTK_BOX (cpu_graph_box), hbox,
+                        FALSE, FALSE, 0);
+
+    /*cpu_legend_box = gtk_hbox_new(TRUE, 10);
+    gtk_box_pack_start (GTK_BOX (hbox), cpu_legend_box,
+                TRUE, TRUE, 0);*/
+
+    GtkWidget* cpu_table = gtk_table_new(std::min(procdata->config.num_cpus / 4, 1),
+                                         std::min(procdata->config.num_cpus, 4),
+                                         TRUE);
+    gtk_table_set_row_spacings(GTK_TABLE(cpu_table), 6);
+    gtk_table_set_col_spacings(GTK_TABLE(cpu_table), 6);
+    gtk_box_pack_start(GTK_BOX(hbox), cpu_table, TRUE, TRUE, 0);
+
+    for (i=0;i<procdata->config.num_cpus; i++) {
+        GtkWidget *temp_hbox;
+        gchar *text;
+
+        temp_hbox = gtk_hbox_new (FALSE, 0);
+        gtk_table_attach(GTK_TABLE(cpu_table), temp_hbox,
+                 i % 4, i % 4 + 1,
+                 i / 4, i / 4 + 1,
+                 static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL),
+                 static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL),
+                 0, 0);
+        //gtk_size_group_add_widget (sizegroup, temp_hbox);
+        /*g_signal_connect (G_OBJECT (temp_hbox), "size_request",
+                     G_CALLBACK(size_request), &cpu_size);
 */
-		color_picker = gsm_color_button_new (&cpu_graph->colors.at(i), GSMCP_TYPE_CPU);
-		g_signal_connect (G_OBJECT (color_picker), "color_set",
-			    G_CALLBACK (cb_cpu_color_changed), GINT_TO_POINTER (i));
-		gtk_box_pack_start (GTK_BOX (temp_hbox), color_picker, FALSE, TRUE, 0);
-		gtk_widget_set_size_request(GTK_WIDGET(color_picker), 32, -1);
-		if(procdata->config.num_cpus == 1) {
-			text = g_strdup (_("CPU"));
-		} else {
-			text = g_strdup_printf (_("CPU%d"), i+1);
-		}
-		label = gtk_label_new (text);
-		gtk_box_pack_start (GTK_BOX (temp_hbox), label, FALSE, FALSE, 6);
-		g_free (text);
-
-		cpu_label = gtk_label_new (NULL);
-		gtk_misc_set_alignment (GTK_MISC (cpu_label), 0.0, 0.5);
-		gtk_box_pack_start (GTK_BOX (temp_hbox), cpu_label, TRUE, TRUE, 0);
-		load_graph_get_labels(cpu_graph)->cpu[i] = cpu_label;
-		
-	}
-
-	procdata->cpu_graph = cpu_graph;
-
-	mem_box = gtk_vbox_new (FALSE, 6);
-	gtk_box_pack_start (GTK_BOX (vbox), mem_box, TRUE, TRUE, 0);
-
-	label = make_title_label (_("Memory and Swap History"));
-	gtk_box_pack_start (GTK_BOX (mem_box), label, FALSE, FALSE, 0);
-
-	mem_graph_box = gtk_vbox_new (FALSE, 6);
-	gtk_box_pack_start (GTK_BOX (mem_box), mem_graph_box, TRUE, TRUE, 0);
-
-
-	mem_graph = new LoadGraph(LOAD_GRAPH_MEM);
-	gtk_box_pack_start (GTK_BOX (mem_graph_box),
-			    load_graph_get_widget(mem_graph),
-			    TRUE,
-			    TRUE,
-			    0);
-
-	hbox = gtk_hbox_new(FALSE, 0);
-	spacer = gtk_label_new ("");
-	gtk_widget_set_size_request(GTK_WIDGET(spacer), 54, -1);
-	gtk_box_pack_start (GTK_BOX (hbox), spacer, 
-			    FALSE, FALSE, 0);
-
-
-	gtk_box_pack_start (GTK_BOX (mem_graph_box), hbox, 
-			    FALSE, FALSE, 0);
-
-	mem_legend_box = gtk_hbox_new(TRUE, 10);
-	gtk_box_pack_start (GTK_BOX (hbox), mem_legend_box, 
-			    TRUE, TRUE, 0);
-
-	table = gtk_table_new (2, 7, FALSE);
-	gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 6);
-	gtk_box_pack_start (GTK_BOX (mem_legend_box), table, 
-			    TRUE, TRUE, 0);
-
-	color_picker = load_graph_get_mem_color_picker(mem_graph);
-	g_signal_connect (G_OBJECT (color_picker), "color_set",
-			    G_CALLBACK (cb_mem_color_changed), procdata);
-	gtk_table_attach (GTK_TABLE (table), color_picker, 0, 1, 0, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
-	
-	label = gtk_label_new (_("Memory"));
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (table), label, 1, 7, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
-	
-	gtk_table_attach (GTK_TABLE (table),
-			  load_graph_get_labels(mem_graph)->memory,
-			  1,
-			  2,
-			  1,
-			  2,
-			  GTK_FILL,
-			  GTK_FILL,
-			  0,
-			  0);
-
-	table = gtk_table_new (2, 7, FALSE);
-	gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 6);
-	gtk_box_pack_start (GTK_BOX (mem_legend_box), table, 
-			    TRUE, TRUE, 0);
-
-	color_picker = load_graph_get_swap_color_picker(mem_graph);
-	g_signal_connect (G_OBJECT (color_picker), "color_set",
-			    G_CALLBACK (cb_swap_color_changed), procdata);
-	gtk_table_attach (GTK_TABLE (table), color_picker, 0, 1, 0, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
-		  
-	label = gtk_label_new (_("Swap"));
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (table), label, 1, 7, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
-	
-	gtk_table_attach (GTK_TABLE (table),
-			  load_graph_get_labels(mem_graph)->swap,
-			  1,
-			  2,
-			  1,
-			  2,
-			  GTK_FILL,
-			  GTK_FILL,
-			  0,
-			  0);
-
-	procdata->mem_graph = mem_graph;
-
-	/* The net box */
-	net_box = gtk_vbox_new (FALSE, 6);
-	gtk_box_pack_start (GTK_BOX (vbox), net_box, TRUE, TRUE, 0);
-
-	label = make_title_label (_("Network History"));
-	gtk_box_pack_start (GTK_BOX (net_box), label, FALSE, FALSE, 0);
-
-	net_graph_box = gtk_vbox_new (FALSE, 6);
-	gtk_box_pack_start (GTK_BOX (net_box), net_graph_box, TRUE, TRUE, 0);
-
-	net_graph = new LoadGraph(LOAD_GRAPH_NET);
-	gtk_box_pack_start (GTK_BOX (net_graph_box),
-			    load_graph_get_widget(net_graph),
-			    TRUE,
-			    TRUE,
-			    0);
-
-	hbox = gtk_hbox_new(FALSE, 0);
-	spacer = gtk_label_new ("");
-	gtk_widget_set_size_request(GTK_WIDGET(spacer), 54, -1);
-	gtk_box_pack_start (GTK_BOX (hbox), spacer, 
-			    FALSE, FALSE, 0);
-
-
-	gtk_box_pack_start (GTK_BOX (net_graph_box), hbox, 
-			    FALSE, FALSE, 0);
-
-	net_legend_box = gtk_hbox_new(TRUE, 10);
-	gtk_box_pack_start (GTK_BOX (hbox), net_legend_box, 
-			    TRUE, TRUE, 0);
-
-	table = gtk_table_new (2, 4, FALSE);
-	gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 6);
-	gtk_box_pack_start (GTK_BOX (net_legend_box), table,
-			    TRUE, TRUE, 0);
-
-	color_picker = gsm_color_button_new (
-		&net_graph->colors.at(0), GSMCP_TYPE_NETWORK_IN);
-	g_signal_connect (G_OBJECT (color_picker), "color_set",
-			    G_CALLBACK (cb_net_in_color_changed), procdata);
-	gtk_table_attach (GTK_TABLE (table), color_picker, 0, 1, 0, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
-
-	label = gtk_label_new (_("Receiving"));
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
-
-	gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_in),
-				1.0,
-				0.5);
+        color_picker = gsm_color_button_new (&cpu_graph->colors.at(i), GSMCP_TYPE_CPU);
+        g_signal_connect (G_OBJECT (color_picker), "color_set",
+                          G_CALLBACK (cb_cpu_color_changed), GINT_TO_POINTER (i));
+        gtk_box_pack_start (GTK_BOX (temp_hbox), color_picker, FALSE, TRUE, 0);
+        gtk_widget_set_size_request(GTK_WIDGET(color_picker), 32, -1);
+        if(procdata->config.num_cpus == 1) {
+            text = g_strdup (_("CPU"));
+        } else {
+            text = g_strdup_printf (_("CPU%d"), i+1);
+        }
+        label = gtk_label_new (text);
+        gtk_box_pack_start (GTK_BOX (temp_hbox), label, FALSE, FALSE, 6);
+        g_free (text);
+
+        cpu_label = gtk_label_new (NULL);
+        gtk_misc_set_alignment (GTK_MISC (cpu_label), 0.0, 0.5);
+        gtk_box_pack_start (GTK_BOX (temp_hbox), cpu_label, TRUE, TRUE, 0);
+        load_graph_get_labels(cpu_graph)->cpu[i] = cpu_label;
+
+    }
+
+    procdata->cpu_graph = cpu_graph;
+
+    mem_box = gtk_vbox_new (FALSE, 6);
+    gtk_box_pack_start (GTK_BOX (vbox), mem_box, TRUE, TRUE, 0);
+
+    label = make_title_label (_("Memory and Swap History"));
+    gtk_box_pack_start (GTK_BOX (mem_box), label, FALSE, FALSE, 0);
+
+    mem_graph_box = gtk_vbox_new (FALSE, 6);
+    gtk_box_pack_start (GTK_BOX (mem_box), mem_graph_box, TRUE, TRUE, 0);
+
+
+    mem_graph = new LoadGraph(LOAD_GRAPH_MEM);
+    gtk_box_pack_start (GTK_BOX (mem_graph_box),
+                        load_graph_get_widget(mem_graph),
+                        TRUE,
+                        TRUE,
+                        0);
+
+    hbox = gtk_hbox_new(FALSE, 0);
+    spacer = gtk_label_new ("");
+    gtk_widget_set_size_request(GTK_WIDGET(spacer), 54, -1);
+    gtk_box_pack_start (GTK_BOX (hbox), spacer,
+                        FALSE, FALSE, 0);
+
+
+    gtk_box_pack_start (GTK_BOX (mem_graph_box), hbox,
+                        FALSE, FALSE, 0);
+
+    mem_legend_box = gtk_hbox_new(TRUE, 10);
+    gtk_box_pack_start (GTK_BOX (hbox), mem_legend_box,
+                        TRUE, TRUE, 0);
+
+    table = gtk_table_new (2, 7, FALSE);
+    gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+    gtk_table_set_col_spacings (GTK_TABLE (table), 6);
+    gtk_box_pack_start (GTK_BOX (mem_legend_box), table,
+                        TRUE, TRUE, 0);
+
+    color_picker = load_graph_get_mem_color_picker(mem_graph);
+    g_signal_connect (G_OBJECT (color_picker), "color_set",
+                      G_CALLBACK (cb_mem_color_changed), procdata);
+    gtk_table_attach (GTK_TABLE (table), color_picker, 0, 1, 0, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+    label = gtk_label_new (_("Memory"));
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    gtk_table_attach (GTK_TABLE (table), label, 1, 7, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+
+    gtk_table_attach (GTK_TABLE (table),
+                      load_graph_get_labels(mem_graph)->memory,
+                      1,
+                      2,
+                      1,
+                      2,
+                      GTK_FILL,
+                      GTK_FILL,
+                      0,
+                      0);
+
+    table = gtk_table_new (2, 7, FALSE);
+    gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+    gtk_table_set_col_spacings (GTK_TABLE (table), 6);
+    gtk_box_pack_start (GTK_BOX (mem_legend_box), table,
+                        TRUE, TRUE, 0);
+
+    color_picker = load_graph_get_swap_color_picker(mem_graph);
+    g_signal_connect (G_OBJECT (color_picker), "color_set",
+                      G_CALLBACK (cb_swap_color_changed), procdata);
+    gtk_table_attach (GTK_TABLE (table), color_picker, 0, 1, 0, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+    label = gtk_label_new (_("Swap"));
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    gtk_table_attach (GTK_TABLE (table), label, 1, 7, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+
+    gtk_table_attach (GTK_TABLE (table),
+                      load_graph_get_labels(mem_graph)->swap,
+                      1,
+                      2,
+                      1,
+                      2,
+                      GTK_FILL,
+                      GTK_FILL,
+                      0,
+                      0);
+
+    procdata->mem_graph = mem_graph;
+
+    /* The net box */
+    net_box = gtk_vbox_new (FALSE, 6);
+    gtk_box_pack_start (GTK_BOX (vbox), net_box, TRUE, TRUE, 0);
+
+    label = make_title_label (_("Network History"));
+    gtk_box_pack_start (GTK_BOX (net_box), label, FALSE, FALSE, 0);
+
+    net_graph_box = gtk_vbox_new (FALSE, 6);
+    gtk_box_pack_start (GTK_BOX (net_box), net_graph_box, TRUE, TRUE, 0);
+
+    net_graph = new LoadGraph(LOAD_GRAPH_NET);
+    gtk_box_pack_start (GTK_BOX (net_graph_box),
+                        load_graph_get_widget(net_graph),
+                        TRUE,
+                        TRUE,
+                        0);
+
+    hbox = gtk_hbox_new(FALSE, 0);
+    spacer = gtk_label_new ("");
+    gtk_widget_set_size_request(GTK_WIDGET(spacer), 54, -1);
+    gtk_box_pack_start (GTK_BOX (hbox), spacer,
+                        FALSE, FALSE, 0);
+
+
+    gtk_box_pack_start (GTK_BOX (net_graph_box), hbox,
+                        FALSE, FALSE, 0);
+
+    net_legend_box = gtk_hbox_new(TRUE, 10);
+    gtk_box_pack_start (GTK_BOX (hbox), net_legend_box,
+                        TRUE, TRUE, 0);
+
+    table = gtk_table_new (2, 4, FALSE);
+    gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+    gtk_table_set_col_spacings (GTK_TABLE (table), 6);
+    gtk_box_pack_start (GTK_BOX (net_legend_box), table,
+                        TRUE, TRUE, 0);
+
+    color_picker = gsm_color_button_new (
+        &net_graph->colors.at(0), GSMCP_TYPE_NETWORK_IN);
+    g_signal_connect (G_OBJECT (color_picker), "color_set",
+                G_CALLBACK (cb_net_in_color_changed), procdata);
+    gtk_table_attach (GTK_TABLE (table), color_picker, 0, 1, 0, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+    label = gtk_label_new (_("Receiving"));
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+
+    gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_in),
+                            1.0,
+                            0.5);
 /*
-	hbox = gtk_hbox_new (FALSE, 0);
-	g_signal_connect (G_OBJECT (hbox), "size_request",
-			  G_CALLBACK(size_request), &net_size);
-	gtk_box_pack_start (GTK_BOX (hbox),
-			    load_graph_get_labels(net_graph)->net_in,
-			    TRUE,
-			    TRUE,
-			    0);
+    hbox = gtk_hbox_new (FALSE, 0);
+    g_signal_connect (G_OBJECT (hbox), "size_request",
+                      G_CALLBACK(size_request), &net_size);
+    gtk_box_pack_start (GTK_BOX (hbox),
+                        load_graph_get_labels(net_graph)->net_in,
+                        TRUE,
+                        TRUE,
+                        0);
 */
-	gtk_widget_set_size_request(GTK_WIDGET(load_graph_get_labels(net_graph)->net_in), 100, -1);
-	gtk_table_attach (GTK_TABLE (table), load_graph_get_labels(net_graph)->net_in, 2, 3, 0, 1, 
-			  static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), GTK_FILL, 0, 0);
-
-	label = gtk_label_new (_("Total Received"));
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (table), label, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
-
-	gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_in_total),
-				1.0,
-				0.5);
-	gtk_table_attach (GTK_TABLE (table),
-			  load_graph_get_labels(net_graph)->net_in_total,
-			  2,
-			  3,
-			  1,
-			  2,
-			  GTK_FILL,
-			  GTK_FILL,
-			  0,
-			  0);
-
-	spacer = gtk_label_new ("");
-	gtk_widget_set_size_request(GTK_WIDGET(spacer), 38, -1);
-	gtk_table_attach (GTK_TABLE (table), spacer, 3, 4, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
-
-	table = gtk_table_new (2, 3, FALSE);
-	gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 6);
-	gtk_box_pack_start (GTK_BOX (net_legend_box), table,
-			    TRUE, TRUE, 0);
-
-	color_picker = gsm_color_button_new (
-		&net_graph->colors.at(1), GSMCP_TYPE_NETWORK_OUT);
-	g_signal_connect (G_OBJECT (color_picker), "color_set",
-			    G_CALLBACK (cb_net_out_color_changed), procdata);
-	gtk_table_attach (GTK_TABLE (table), color_picker, 0, 1, 0, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
-
-	label = gtk_label_new (_("Sending"));
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
-
-	gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_out),
-				1.0,
-				0.5);
+    gtk_widget_set_size_request(GTK_WIDGET(load_graph_get_labels(net_graph)->net_in), 100, -1);
+    gtk_table_attach (GTK_TABLE (table), load_graph_get_labels(net_graph)->net_in, 2, 3, 0, 1,
+                      static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), GTK_FILL, 0, 0);
+
+    label = gtk_label_new (_("Total Received"));
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    gtk_table_attach (GTK_TABLE (table), label, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+
+    gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_in_total),
+                            1.0,
+                            0.5);
+    gtk_table_attach (GTK_TABLE (table),
+                      load_graph_get_labels(net_graph)->net_in_total,
+                      2,
+                      3,
+                      1,
+                      2,
+                      GTK_FILL,
+                      GTK_FILL,
+                      0,
+                      0);
+
+    spacer = gtk_label_new ("");
+    gtk_widget_set_size_request(GTK_WIDGET(spacer), 38, -1);
+    gtk_table_attach (GTK_TABLE (table), spacer, 3, 4, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+
+    table = gtk_table_new (2, 3, FALSE);
+    gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+    gtk_table_set_col_spacings (GTK_TABLE (table), 6);
+    gtk_box_pack_start (GTK_BOX (net_legend_box), table,
+                        TRUE, TRUE, 0);
+
+    color_picker = gsm_color_button_new (
+        &net_graph->colors.at(1), GSMCP_TYPE_NETWORK_OUT);
+    g_signal_connect (G_OBJECT (color_picker), "color_set",
+                G_CALLBACK (cb_net_out_color_changed), procdata);
+    gtk_table_attach (GTK_TABLE (table), color_picker, 0, 1, 0, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+    label = gtk_label_new (_("Sending"));
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+
+    gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_out),
+                            1.0,
+                            0.5);
 /*
-	hbox = gtk_hbox_new (FALSE, 0);
-	g_signal_connect (G_OBJECT (load_graph_get_labels(net_graph)->net_out), "size_request",
-			  G_CALLBACK(size_request), &net_size);
-
-	gtk_box_pack_start (GTK_BOX (hbox),
-			    load_graph_get_labels(net_graph)->net_out,
-			    TRUE,
-			    TRUE,
-			    0);
+    hbox = gtk_hbox_new (FALSE, 0);
+    g_signal_connect (G_OBJECT (load_graph_get_labels(net_graph)->net_out), "size_request",
+                      G_CALLBACK(size_request), &net_size);
+
+    gtk_box_pack_start (GTK_BOX (hbox),
+                        load_graph_get_labels(net_graph)->net_out,
+                        TRUE,
+                        TRUE,
+                        0);
 */
-	gtk_widget_set_size_request(GTK_WIDGET(load_graph_get_labels(net_graph)->net_out), 100, -1);
-	gtk_table_attach (GTK_TABLE (table), load_graph_get_labels(net_graph)->net_out, 2, 3, 0, 1, 
-			  static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), GTK_FILL, 0, 0);
-
-	label = gtk_label_new (_("Total Sent"));
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (table), label, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
-
-	gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_out_total),
-				1.0,
-				0.5);
-	gtk_table_attach (GTK_TABLE (table),
-			  load_graph_get_labels(net_graph)->net_out_total,
-			  2,
-			  3,
-			  1,
-			  2,
-			  GTK_FILL,
-			  GTK_FILL,
-			  0,
-			  0);
-
-	spacer = gtk_label_new ("");
-	gtk_widget_set_size_request(GTK_WIDGET(spacer), 38, -1);
-	gtk_table_attach (GTK_TABLE (table), spacer, 3, 4, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
-
-	procdata->net_graph = net_graph;
-
-	return vbox;
+    gtk_widget_set_size_request(GTK_WIDGET(load_graph_get_labels(net_graph)->net_out), 100, -1);
+    gtk_table_attach (GTK_TABLE (table), load_graph_get_labels(net_graph)->net_out, 2, 3, 0, 1,
+                      static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), GTK_FILL, 0, 0);
+
+    label = gtk_label_new (_("Total Sent"));
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    gtk_table_attach (GTK_TABLE (table), label, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+
+    gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_out_total),
+                            1.0,
+                            0.5);
+    gtk_table_attach (GTK_TABLE (table),
+                      load_graph_get_labels(net_graph)->net_out_total,
+                      2,
+                      3,
+                      1,
+                      2,
+                      GTK_FILL,
+                      GTK_FILL,
+                      0,
+                      0);
+
+    spacer = gtk_label_new ("");
+    gtk_widget_set_size_request(GTK_WIDGET(spacer), 38, -1);
+    gtk_table_attach (GTK_TABLE (table), spacer, 3, 4, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+
+    procdata->net_graph = net_graph;
+
+    return vbox;
 }
 
 static void
 menu_item_select_cb (GtkMenuItem *proxy,
                      ProcData *procdata)
 {
-	GtkAction *action;
-	char *message;
-
-	action = gtk_activatable_get_related_action (GTK_ACTIVATABLE(proxy));
-	g_assert(action);
-
-	g_object_get (G_OBJECT (action), "tooltip", &message, NULL);
-	if (message)
-	{
-		gtk_statusbar_push (GTK_STATUSBAR (procdata->statusbar),
-				    procdata->tip_message_cid, message);
-		g_free (message);
-	}
+    GtkAction *action;
+    char *message;
+
+    action = gtk_activatable_get_related_action (GTK_ACTIVATABLE(proxy));
+    g_assert(action);
+
+    g_object_get (G_OBJECT (action), "tooltip", &message, NULL);
+    if (message)
+    {
+        gtk_statusbar_push (GTK_STATUSBAR (procdata->statusbar),
+                    procdata->tip_message_cid, message);
+        g_free (message);
+    }
 }
 
 static void
 menu_item_deselect_cb (GtkMenuItem *proxy,
                        ProcData *procdata)
 {
-	gtk_statusbar_pop (GTK_STATUSBAR (procdata->statusbar),
-			   procdata->tip_message_cid);
+    gtk_statusbar_pop (GTK_STATUSBAR (procdata->statusbar),
+               procdata->tip_message_cid);
 }
 
 static void
@@ -578,12 +578,12 @@ connect_proxy_cb (GtkUIManager *manager,
                   GtkWidget *proxy,
                   ProcData *procdata)
 {
-	if (GTK_IS_MENU_ITEM (proxy)) {
-		g_signal_connect (proxy, "select",
-				  G_CALLBACK (menu_item_select_cb), procdata);
-		g_signal_connect (proxy, "deselect",
-				  G_CALLBACK (menu_item_deselect_cb), procdata);
-	}
+    if (GTK_IS_MENU_ITEM (proxy)) {
+        g_signal_connect (proxy, "select",
+                          G_CALLBACK (menu_item_select_cb), procdata);
+        g_signal_connect (proxy, "deselect",
+                          G_CALLBACK (menu_item_deselect_cb), procdata);
+    }
 }
 
 static void
@@ -592,241 +592,241 @@ disconnect_proxy_cb (GtkUIManager *manager,
                      GtkWidget *proxy,
                      ProcData *procdata)
 {
-	if (GTK_IS_MENU_ITEM (proxy)) {
-		g_signal_handlers_disconnect_by_func
-			(proxy, (void*)(G_CALLBACK(menu_item_select_cb)), procdata);
-		g_signal_handlers_disconnect_by_func
-			(proxy, (void*)(G_CALLBACK(menu_item_deselect_cb)), procdata);
-	}
+    if (GTK_IS_MENU_ITEM (proxy)) {
+        g_signal_handlers_disconnect_by_func
+            (proxy, (void*)(G_CALLBACK(menu_item_select_cb)), procdata);
+        g_signal_handlers_disconnect_by_func
+            (proxy, (void*)(G_CALLBACK(menu_item_deselect_cb)), procdata);
+    }
 }
 
 void
 create_main_window (ProcData *procdata)
 {
-	gint i;
-	gint width, height;
-	GtkWidget *app;
-	GtkAction *action;
-	GtkWidget *menubar;
-	GtkWidget *main_box;
-	GtkWidget *notebook;
-	GtkWidget *tab_label1, *tab_label2, *tab_label3;
-	GtkWidget *vbox1;
-	GtkWidget *sys_box, *devices_box;
-	GtkWidget *sysinfo_box, *sysinfo_label;
-
-	app = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_title(GTK_WINDOW(app), _("System Monitor"));
-
-	GdkScreen* screen = gtk_widget_get_screen(app);
+    gint i;
+    gint width, height;
+    GtkWidget *app;
+    GtkAction *action;
+    GtkWidget *menubar;
+    GtkWidget *main_box;
+    GtkWidget *notebook;
+    GtkWidget *tab_label1, *tab_label2, *tab_label3;
+    GtkWidget *vbox1;
+    GtkWidget *sys_box, *devices_box;
+    GtkWidget *sysinfo_box, *sysinfo_label;
+
+    app = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    gtk_window_set_title(GTK_WINDOW(app), _("System Monitor"));
+
+    GdkScreen* screen = gtk_widget_get_screen(app);
 #if GTK_CHECK_VERSION(3,0,0)
-	/* use visual, if available */
-	GdkVisual* visual = gdk_screen_get_rgba_visual(screen);
-	if (visual)
-		gtk_widget_set_visual(app, visual);
+    /* use visual, if available */
+    GdkVisual* visual = gdk_screen_get_rgba_visual(screen);
+    if (visual)
+        gtk_widget_set_visual(app, visual);
 #else
-	/* use rgba colormap, if available */
-	GdkColormap* colormap = gdk_screen_get_rgba_colormap(screen);
-	if (colormap)
-		gtk_widget_set_default_colormap(colormap);
+    /* use rgba colormap, if available */
+    GdkColormap* colormap = gdk_screen_get_rgba_colormap(screen);
+    if (colormap)
+        gtk_widget_set_default_colormap(colormap);
 #endif
 
-	main_box = gtk_vbox_new (FALSE, 0);
-	gtk_container_add(GTK_CONTAINER(app), main_box);
-	
-	width = procdata->config.width;
-	height = procdata->config.height;
-	gtk_window_set_default_size (GTK_WINDOW (app), width, height);
-	gtk_window_set_resizable (GTK_WINDOW (app), TRUE);
-	
-	/* create the menubar */
-	procdata->uimanager = gtk_ui_manager_new ();
-
-	/* show tooltips in the statusbar */
-	g_signal_connect (procdata->uimanager, "connect_proxy",
-			  G_CALLBACK (connect_proxy_cb), procdata);
-	g_signal_connect (procdata->uimanager, "disconnect_proxy",
-			 G_CALLBACK (disconnect_proxy_cb), procdata);
-
-	gtk_window_add_accel_group (GTK_WINDOW (app),
-				    gtk_ui_manager_get_accel_group (procdata->uimanager));
-
-	if (!gtk_ui_manager_add_ui_from_string (procdata->uimanager,
-	                                        ui_info,
-	                                        -1,
-	                                        NULL)) {
-		g_error("building menus failed");
-	}
-
-	procdata->action_group = gtk_action_group_new ("ProcmanActions");
-	gtk_action_group_set_translation_domain (procdata->action_group, NULL);
-	gtk_action_group_add_actions (procdata->action_group,
-	                              menu_entries,
-	                              G_N_ELEMENTS (menu_entries),
-	                              procdata);
-	gtk_action_group_add_toggle_actions (procdata->action_group,
-	                                     toggle_menu_entries,
-	                                     G_N_ELEMENTS (toggle_menu_entries),
-	                                     procdata);
-
-	gtk_action_group_add_radio_actions (procdata->action_group,
-					    radio_menu_entries,
-					    G_N_ELEMENTS (radio_menu_entries),
-					    procdata->config.whose_process,
-					    G_CALLBACK(cb_radio_processes),
-					    procdata);
-
-	gtk_ui_manager_insert_action_group (procdata->uimanager,
-	                                    procdata->action_group,
-	                                    0);
-
-	menubar = gtk_ui_manager_get_widget (procdata->uimanager, "/MenuBar");
-	gtk_box_pack_start (GTK_BOX (main_box), menubar, FALSE, FALSE, 0);
-
-
-	/* create the main notebook */
-	procdata->notebook = notebook = gtk_notebook_new ();
-  	gtk_box_pack_start (GTK_BOX (main_box), 
-	                    notebook, 
-	                    TRUE, 
-	                    TRUE, 
-	                    0);
-
-	sysinfo_box = gtk_hbox_new(TRUE, 0); // procman_create_sysinfo_view();
-	sysinfo_label = gtk_label_new(_("System"));
-	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), sysinfo_box, sysinfo_label);
-
-	vbox1 = create_proc_view (procdata);
-	tab_label1 = gtk_label_new (_("Processes"));
-	gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox1, tab_label1);
-	
-	sys_box = create_sys_view (procdata);
-	tab_label2 = gtk_label_new (_("Resources"));
-	gtk_notebook_append_page (GTK_NOTEBOOK (notebook), sys_box, tab_label2);
-
-	devices_box = create_disk_view (procdata);
-	tab_label3 = gtk_label_new (_("File Systems"));
-	gtk_notebook_append_page (GTK_NOTEBOOK (notebook), devices_box, tab_label3);
-
-	g_signal_connect (G_OBJECT (notebook), "switch-page",
-			  G_CALLBACK (cb_switch_page), procdata);
-	g_signal_connect (G_OBJECT (notebook), "change-current-page",
-			  G_CALLBACK (cb_change_current_page), procdata);
-
-	gtk_widget_show_all(notebook); // need to make page switch work
-	gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), procdata->config.current_tab);
-	cb_change_current_page (GTK_NOTEBOOK (notebook), procdata->config.current_tab, procdata);
-	g_signal_connect (G_OBJECT (app), "delete_event",
-                          G_CALLBACK (cb_app_delete),
-                          procdata);
-
-	GtkAccelGroup *accel_group;
-	GClosure *goto_tab_closure[4];
-	accel_group = gtk_accel_group_new ();
-	gtk_window_add_accel_group (GTK_WINDOW(app), accel_group);
-	for (i = 0; i < 4; ++i) {
-		goto_tab_closure[i] = g_cclosure_new_swap (G_CALLBACK (cb_proc_goto_tab),
-							   (gpointer) i, NULL);
-		gtk_accel_group_connect (accel_group, '0'+(i+1),
-					 GDK_MOD1_MASK, GTK_ACCEL_VISIBLE,
-					 goto_tab_closure[i]);
-	}
-
-	/* create the statusbar */
-	procdata->statusbar = gtk_statusbar_new();
-	gtk_box_pack_end(GTK_BOX(main_box), procdata->statusbar, FALSE, FALSE, 0);
-	procdata->tip_message_cid = gtk_statusbar_get_context_id
-		(GTK_STATUSBAR (procdata->statusbar), "tip_message");
-
-
-	action = gtk_action_group_get_action (procdata->action_group, "ShowDependencies");
-	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
-				      procdata->config.show_tree);
-
-	gtk_widget_show_all(app);
-	procdata->app = app;
+    main_box = gtk_vbox_new (FALSE, 0);
+    gtk_container_add(GTK_CONTAINER(app), main_box);
+
+    width = procdata->config.width;
+    height = procdata->config.height;
+    gtk_window_set_default_size (GTK_WINDOW (app), width, height);
+    gtk_window_set_resizable (GTK_WINDOW (app), TRUE);
+
+    /* create the menubar */
+    procdata->uimanager = gtk_ui_manager_new ();
+
+    /* show tooltips in the statusbar */
+    g_signal_connect (procdata->uimanager, "connect_proxy",
+                      G_CALLBACK (connect_proxy_cb), procdata);
+    g_signal_connect (procdata->uimanager, "disconnect_proxy",
+                      G_CALLBACK (disconnect_proxy_cb), procdata);
+
+    gtk_window_add_accel_group (GTK_WINDOW (app),
+                                gtk_ui_manager_get_accel_group (procdata->uimanager));
+
+    if (!gtk_ui_manager_add_ui_from_string (procdata->uimanager,
+                                            ui_info,
+                                            -1,
+                                            NULL)) {
+        g_error("building menus failed");
+    }
+
+    procdata->action_group = gtk_action_group_new ("ProcmanActions");
+    gtk_action_group_set_translation_domain (procdata->action_group, NULL);
+    gtk_action_group_add_actions (procdata->action_group,
+                                  menu_entries,
+                                  G_N_ELEMENTS (menu_entries),
+                                  procdata);
+    gtk_action_group_add_toggle_actions (procdata->action_group,
+                                         toggle_menu_entries,
+                                         G_N_ELEMENTS (toggle_menu_entries),
+                                         procdata);
+
+    gtk_action_group_add_radio_actions (procdata->action_group,
+                        radio_menu_entries,
+                        G_N_ELEMENTS (radio_menu_entries),
+                        procdata->config.whose_process,
+                        G_CALLBACK(cb_radio_processes),
+                        procdata);
+
+    gtk_ui_manager_insert_action_group (procdata->uimanager,
+                                        procdata->action_group,
+                                        0);
+
+    menubar = gtk_ui_manager_get_widget (procdata->uimanager, "/MenuBar");
+    gtk_box_pack_start (GTK_BOX (main_box), menubar, FALSE, FALSE, 0);
+
+
+    /* create the main notebook */
+    procdata->notebook = notebook = gtk_notebook_new ();
+      gtk_box_pack_start (GTK_BOX (main_box),
+                          notebook,
+                          TRUE,
+                          TRUE,
+                          0);
+
+    sysinfo_box = gtk_hbox_new(TRUE, 0); // procman_create_sysinfo_view();
+    sysinfo_label = gtk_label_new(_("System"));
+    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), sysinfo_box, sysinfo_label);
+
+    vbox1 = create_proc_view (procdata);
+    tab_label1 = gtk_label_new (_("Processes"));
+    gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox1, tab_label1);
+
+    sys_box = create_sys_view (procdata);
+    tab_label2 = gtk_label_new (_("Resources"));
+    gtk_notebook_append_page (GTK_NOTEBOOK (notebook), sys_box, tab_label2);
+
+    devices_box = create_disk_view (procdata);
+    tab_label3 = gtk_label_new (_("File Systems"));
+    gtk_notebook_append_page (GTK_NOTEBOOK (notebook), devices_box, tab_label3);
+
+    g_signal_connect (G_OBJECT (notebook), "switch-page",
+              G_CALLBACK (cb_switch_page), procdata);
+    g_signal_connect (G_OBJECT (notebook), "change-current-page",
+              G_CALLBACK (cb_change_current_page), procdata);
+
+    gtk_widget_show_all(notebook); // need to make page switch work
+    gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), procdata->config.current_tab);
+    cb_change_current_page (GTK_NOTEBOOK (notebook), procdata->config.current_tab, procdata);
+    g_signal_connect (G_OBJECT (app), "delete_event",
+                      G_CALLBACK (cb_app_delete),
+                      procdata);
+
+    GtkAccelGroup *accel_group;
+    GClosure *goto_tab_closure[4];
+    accel_group = gtk_accel_group_new ();
+    gtk_window_add_accel_group (GTK_WINDOW(app), accel_group);
+    for (i = 0; i < 4; ++i) {
+        goto_tab_closure[i] = g_cclosure_new_swap (G_CALLBACK (cb_proc_goto_tab),
+                                                   (gpointer) i, NULL);
+        gtk_accel_group_connect (accel_group, '0'+(i+1),
+                                 GDK_MOD1_MASK, GTK_ACCEL_VISIBLE,
+                                 goto_tab_closure[i]);
+    }
+
+    /* create the statusbar */
+    procdata->statusbar = gtk_statusbar_new();
+    gtk_box_pack_end(GTK_BOX(main_box), procdata->statusbar, FALSE, FALSE, 0);
+    procdata->tip_message_cid = gtk_statusbar_get_context_id
+        (GTK_STATUSBAR (procdata->statusbar), "tip_message");
+
+
+    action = gtk_action_group_get_action (procdata->action_group, "ShowDependencies");
+    gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
+                      procdata->config.show_tree);
+
+    gtk_widget_show_all(app);
+    procdata->app = app;
 }
 
 void
 do_popup_menu (ProcData *procdata, GdkEventButton *event)
 {
-	guint button;
-	guint32 event_time;
-
-	if (event) {
-		button = event->button;
-		event_time = event->time;
-	}
-	else {
-		button = 0;
-		event_time = gtk_get_current_event_time ();
-	}
-
-	gtk_menu_popup (GTK_MENU (procdata->popup_menu), NULL, NULL,
-			NULL, NULL, button, event_time);
+    guint button;
+    guint32 event_time;
+
+    if (event) {
+        button = event->button;
+        event_time = event->time;
+    }
+    else {
+        button = 0;
+        event_time = gtk_get_current_event_time ();
+    }
+
+    gtk_menu_popup (GTK_MENU (procdata->popup_menu), NULL, NULL,
+                    NULL, NULL, button, event_time);
 }
 
 void
 update_sensitivity(ProcData *data)
 {
-	const char * const selected_actions[] = { "StopProcess",
-						  "ContProcess",
-						  "EndProcess",
-						  "KillProcess",
-						  "ChangePriority",
-						  "MemoryMaps",
-						  "OpenFiles" };
-
-	const char * const processes_actions[] = { "ShowActiveProcesses",
-						   "ShowAllProcesses",
-						   "ShowMyProcesses",
-						   "ShowDependencies",
-						   "Refresh"
-	};
-
-	size_t i;
-	gboolean processes_sensitivity, selected_sensitivity;
-	GtkAction *action;
-
-	processes_sensitivity = (data->config.current_tab == PROCMAN_TAB_PROCESSES);
-	selected_sensitivity = (processes_sensitivity && data->selected_process != NULL);
-
-	if(data->endprocessbutton) {
-		/* avoid error on startup if endprocessbutton
-		   has not been built yet */
-		gtk_widget_set_sensitive(data->endprocessbutton, selected_sensitivity);
-	}
-
-	for (i = 0; i != G_N_ELEMENTS(processes_actions); ++i) {
-		action = gtk_action_group_get_action(data->action_group,
-						     processes_actions[i]);
-		gtk_action_set_sensitive(action, processes_sensitivity);
-	}
-
-	for (i = 0; i != G_N_ELEMENTS(selected_actions); ++i) {
-		action = gtk_action_group_get_action(data->action_group,
-						     selected_actions[i]);
-		gtk_action_set_sensitive(action, selected_sensitivity);
-	}
+    const char * const selected_actions[] = { "StopProcess",
+                                              "ContProcess",
+                                              "EndProcess",
+                                              "KillProcess",
+                                              "ChangePriority",
+                                              "MemoryMaps",
+                                              "OpenFiles" };
+
+    const char * const processes_actions[] = { "ShowActiveProcesses",
+                                               "ShowAllProcesses",
+                                               "ShowMyProcesses",
+                                               "ShowDependencies",
+                                               "Refresh"
+    };
+
+    size_t i;
+    gboolean processes_sensitivity, selected_sensitivity;
+    GtkAction *action;
+
+    processes_sensitivity = (data->config.current_tab == PROCMAN_TAB_PROCESSES);
+    selected_sensitivity = (processes_sensitivity && data->selected_process != NULL);
+
+    if(data->endprocessbutton) {
+        /* avoid error on startup if endprocessbutton
+           has not been built yet */
+        gtk_widget_set_sensitive(data->endprocessbutton, selected_sensitivity);
+    }
+
+    for (i = 0; i != G_N_ELEMENTS(processes_actions); ++i) {
+        action = gtk_action_group_get_action(data->action_group,
+                                             processes_actions[i]);
+        gtk_action_set_sensitive(action, processes_sensitivity);
+    }
+
+    for (i = 0; i != G_N_ELEMENTS(selected_actions); ++i) {
+        action = gtk_action_group_get_action(data->action_group,
+                                             selected_actions[i]);
+        gtk_action_set_sensitive(action, selected_sensitivity);
+    }
 }
 
-static void		
+static void
 cb_toggle_tree (GtkAction *action, gpointer data)
 {
-	ProcData *procdata = static_cast<ProcData*>(data);
-	GSettings *settings = procdata->settings;
-	gboolean show;
+    ProcData *procdata = static_cast<ProcData*>(data);
+    GSettings *settings = procdata->settings;
+    gboolean show;
 
-	show = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
-	if (show == procdata->config.show_tree)
-		return;
+    show = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+    if (show == procdata->config.show_tree)
+        return;
 
-	g_settings_set_boolean (settings, "show-tree", show);
+    g_settings_set_boolean (settings, "show-tree", show);
 }
 
 static void
 cb_proc_goto_tab (gint tab)
 {
-	ProcData *data = ProcData::get_instance ();
-	gtk_notebook_set_current_page (GTK_NOTEBOOK (data->notebook), tab);
+    ProcData *data = ProcData::get_instance ();
+    gtk_notebook_set_current_page (GTK_NOTEBOOK (data->notebook), tab);
 }