kernelshark: Group list filters together

Move the filters around so that the graph filters
are all together, and the list filters are all together.
This makes accessing the filters a bit easier when they
are separate.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

1 files changed, 43 insertions, 44 deletions

diff --git a/kernel-shark.c b/kernel-shark.c
index 5dde3dc..2f2d968 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -1682,145 +1682,144 @@ void kernel_shark(int argc, char **argv)
         gtk_widget_show(sub_item);
 
 
-        /* --- Filter - List Tasks Option --- */
+        /* --- Filter - Graph Tasks Option --- */
 
-        sub_item = gtk_menu_item_new_with_label("list tasks");
+        sub_item = gtk_menu_item_new_with_label("tasks");
 
         /* Add them to the menu */
         gtk_menu_shell_append(GTK_MENU_SHELL (menu), sub_item);
 
         /* We can attach the Quit menu item to our exit function */
         g_signal_connect_swapped (G_OBJECT (sub_item), "activate",
-                                  G_CALLBACK (list_tasks_clicked),
+                                  G_CALLBACK (graph_tasks_clicked),
                                   (gpointer) info);
 
-        info->list_task_menu = sub_item;
+        info->graph_task_menu = sub_item;
 
-        /* Only show this item when list and graph tasks are not synced */
+        /* We do need to show menu items */
+        gtk_widget_show(sub_item);
 
 
-        /* --- Filter - Graph Tasks Option --- */
+        /* --- Filter - Graph Hide Tasks Option --- */
 
-        sub_item = gtk_menu_item_new_with_label("tasks");
+        sub_item = gtk_menu_item_new_with_label("hide tasks");
 
         /* Add them to the menu */
         gtk_menu_shell_append(GTK_MENU_SHELL (menu), sub_item);
 
         /* We can attach the Quit menu item to our exit function */
         g_signal_connect_swapped (G_OBJECT (sub_item), "activate",
-                                  G_CALLBACK (graph_tasks_clicked),
+                                  G_CALLBACK (graph_hide_tasks_clicked),
                                   (gpointer) info);
 
-        info->graph_task_menu = sub_item;
+        info->graph_hide_task_menu = sub_item;
 
         /* We do need to show menu items */
         gtk_widget_show(sub_item);
 
 
-        /* --- Filter - List Hide Tasks Option --- */
 
-        sub_item = gtk_menu_item_new_with_label("list hide tasks");
+        /* --- Filter - Events Option --- */
+
+        /* The list and graph events start off insync */
+        sub_item = gtk_menu_item_new_with_label("events");
 
         /* Add them to the menu */
         gtk_menu_shell_append(GTK_MENU_SHELL (menu), sub_item);
 
         /* We can attach the Quit menu item to our exit function */
         g_signal_connect_swapped (G_OBJECT (sub_item), "activate",
-                                  G_CALLBACK (list_hide_tasks_clicked),
+                                  G_CALLBACK (graph_events_clicked),
                                   (gpointer) info);
 
-        info->list_hide_task_menu = sub_item;
+        info->graph_events_menu = sub_item;
 
-        /* Only show this item when list and graph tasks are not synced */
+        /* We do need to show menu items */
+        gtk_widget_show(sub_item);
 
 
-        /* --- Filter - Graph Hide Tasks Option --- */
+        /* --- Filter - Graph Advanced Events Option --- */
 
-        sub_item = gtk_menu_item_new_with_label("hide tasks");
+        /* The list and graph events start off in sync */
+        sub_item = gtk_menu_item_new_with_label("advanced events");
 
         /* Add them to the menu */
         gtk_menu_shell_append(GTK_MENU_SHELL (menu), sub_item);
 
         /* We can attach the Quit menu item to our exit function */
         g_signal_connect_swapped (G_OBJECT (sub_item), "activate",
-                                  G_CALLBACK (graph_hide_tasks_clicked),
+                                  G_CALLBACK (adv_graph_filter_clicked),
                                   (gpointer) info);
 
-        info->graph_hide_task_menu = sub_item;
+        info->graph_adv_events_menu = sub_item;
 
         /* We do need to show menu items */
         gtk_widget_show(sub_item);
 
+        /* --- Filter - List Tasks Option --- */
 
-        /* --- Filter - List Events Option --- */
-
-        sub_item = gtk_menu_item_new_with_label("list events");
+        sub_item = gtk_menu_item_new_with_label("list tasks");
 
         /* Add them to the menu */
         gtk_menu_shell_append(GTK_MENU_SHELL (menu), sub_item);
 
         /* We can attach the Quit menu item to our exit function */
         g_signal_connect_swapped (G_OBJECT (sub_item), "activate",
-                                  G_CALLBACK (list_events_clicked),
+                                  G_CALLBACK (list_tasks_clicked),
                                   (gpointer) info);
 
-        info->list_events_menu = sub_item;
+        info->list_task_menu = sub_item;
 
-        /* We do not show this menu (yet) */
+        /* Only show this item when list and graph tasks are not synced */
 
 
-        /* --- Filter - Events Option --- */
+        /* --- Filter - List Hide Tasks Option --- */
 
-        /* The list and graph events start off insync */
-        sub_item = gtk_menu_item_new_with_label("events");
+        sub_item = gtk_menu_item_new_with_label("list hide tasks");
 
         /* Add them to the menu */
         gtk_menu_shell_append(GTK_MENU_SHELL (menu), sub_item);
 
         /* We can attach the Quit menu item to our exit function */
         g_signal_connect_swapped (G_OBJECT (sub_item), "activate",
-                                  G_CALLBACK (graph_events_clicked),
+                                  G_CALLBACK (list_hide_tasks_clicked),
                                   (gpointer) info);
 
-        info->graph_events_menu = sub_item;
-
-        /* We do need to show menu items */
-        gtk_widget_show(sub_item);
+        info->list_hide_task_menu = sub_item;
 
+        /* Only show this item when list and graph tasks are not synced */
 
-        /* --- Filter - List Advanced Events Option --- */
+        /* --- Filter - List Events Option --- */
 
-        sub_item = gtk_menu_item_new_with_label("list advanced event");
+        sub_item = gtk_menu_item_new_with_label("list events");
 
         /* Add them to the menu */
         gtk_menu_shell_append(GTK_MENU_SHELL (menu), sub_item);
 
         /* We can attach the Quit menu item to our exit function */
         g_signal_connect_swapped (G_OBJECT (sub_item), "activate",
-                                  G_CALLBACK (adv_list_filter_clicked),
+                                  G_CALLBACK (list_events_clicked),
                                   (gpointer) info);
 
-        info->list_adv_events_menu = sub_item;
+        info->list_events_menu = sub_item;
+
         /* We do not show this menu (yet) */
 
 
-        /* --- Filter - Graph Advanced Events Option --- */
+        /* --- Filter - List Advanced Events Option --- */
 
-        /* The list and graph events start off in sync */
-        sub_item = gtk_menu_item_new_with_label("advanced events");
+        sub_item = gtk_menu_item_new_with_label("list advanced event");
 
         /* Add them to the menu */
         gtk_menu_shell_append(GTK_MENU_SHELL (menu), sub_item);
 
         /* We can attach the Quit menu item to our exit function */
         g_signal_connect_swapped (G_OBJECT (sub_item), "activate",
-                                  G_CALLBACK (adv_graph_filter_clicked),
+                                  G_CALLBACK (adv_list_filter_clicked),
                                   (gpointer) info);
 
-        info->graph_adv_events_menu = sub_item;
-
-        /* We do need to show menu items */
-        gtk_widget_show(sub_item);
+        info->list_adv_events_menu = sub_item;
+        /* We do not show this menu (yet) */
 
 
         /* --- Filter - CPUs Option --- */