X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2FmainWin%2Fsrc%2Fcallbacks.c;h=93c063f91e40e9364404b7c6c9a7b82e08ffeb41;hb=10f2da9501711d45ea6d3130efaa1337c7315e31;hp=4d6499c658d26aec172f4eda5001296ae91ee56c;hpb=6b1d312011afb06cc4eac46c3a49abdbf9243a48;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c b/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c
index 4d6499c6..93c063f9 100644
--- a/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c
+++ b/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c
@@ -13,89 +13,57 @@
 #include <lttv/toolbar.h>
 #include <lttv/gtkTraceSet.h>
 #include <lttv/module.h>
+#include <lttv/gtkdirsel.h>
+#include <lttv/iattribute.h>
 
-#define PATH_LENGTH     256
+#define PATH_LENGTH          256
+#define DEFAULT_TIME_WIDTH_S   1
+
+//extern LttvTracesetContext * gTracesetContext;
+extern LttTrace *g_init_trace ;
 
-extern systemView * gSysView;
-extern LttvTracesetContext * gTracesetContext;
 
 /** Array containing instanced objects. */
-extern GSList * Main_Window_List;
+extern GSList * g_main_window_list;
+
+static int g_win_count = 0;
 
 mainWindow * get_window_data_struct(GtkWidget * widget);
+char * get_unload_module(char ** loaded_module_name, int nb_module);
+char * get_remove_trace(char ** all_trace_name, int nb_trace);
+char * get_selection(char ** all_name, int nb, char *title, char * column_title);
+void * create_tab(GtkWidget* parent, GtkNotebook * notebook, char * label);
 
-/* test part */
-void insertView(GtkWidget* widget, view_constructor constructor);
+void insert_viewer(GtkWidget* widget, view_constructor constructor);
 
-void
-on_textview1_grab_focus                     (GtkTextView     *text_view,
-					  gpointer         user_data)
+enum
 {
-  GtkWidget * widget;
-  GtkCustom * custom = (GtkCustom*)user_data;
-  widget = gtk_widget_get_parent((GtkWidget*)text_view);
-  widget = gtk_widget_get_parent(widget);
-  gtk_custom_set_focus((GtkWidget*)custom, (gpointer)widget);
-}
+  MODULE_COLUMN,
+  N_COLUMNS
+};
+
 
 void
-insertViewTest(GtkMenuItem *menuitem, gpointer user_data)
+insert_viewer_wrap(GtkMenuItem *menuitem, gpointer user_data)
 {
   guint val = 20;
-  insertView((GtkWidget*)menuitem, (view_constructor)user_data);
+  insert_viewer((GtkWidget*)menuitem, (view_constructor)user_data);
   //  selected_hook(&val);
 }
 
-void
-on_insert_viewer_test_activate         (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-  GtkWidget *scrolledwindow1, *textview1, *label;
-  static int count = 0;
-  char str[64];
-  GtkCustom * custom;
-  GtkTextBuffer* buf;
-  
-  mainWindow * mwData;  
-  mwData = get_window_data_struct((GtkWidget*)menuitem);
-  if(!mwData->CurrentTab) return;
-  custom = mwData->CurrentTab->custom;
-
-  sprintf(str,"label : %d",++count);
-  scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show (scrolledwindow1);
-  label = gtk_label_new(str);
-  gtk_widget_show(label);
-
-  gtk_custom_widget_add(custom, scrolledwindow1);
-  gtk_widget_set_size_request ((GtkWidget*)scrolledwindow1, 800, 100);
-  
-  textview1 = gtk_text_view_new ();
-  gtk_widget_show (textview1);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow1), textview1);
-  buf =  gtk_text_view_get_buffer((GtkTextView*)textview1);
-  sprintf(str,"text view : %d",count);
-  gtk_text_buffer_set_text(buf,str, -1);
-  
-  g_signal_connect ((gpointer) textview1, "grab_focus",
-		    G_CALLBACK (on_textview1_grab_focus), custom);
-}
-
-/* end of test part */
-
 
 /* internal functions */
-void insertView(GtkWidget* widget, view_constructor constructor)
+void insert_viewer(GtkWidget* widget, view_constructor constructor)
 {
   GtkCustom * custom;
-  mainWindow * mwData;  
+  mainWindow * mw_data;  
   GtkWidget * viewer;
 
-  mwData = get_window_data_struct(widget);
-  if(!mwData->CurrentTab) return;
-  custom = mwData->CurrentTab->custom;
+  mw_data = get_window_data_struct(widget);
+  if(!mw_data->CurrentTab) return;
+  custom = mw_data->CurrentTab->custom;
 
-  viewer = (GtkWidget*)constructor(mwData);
+  viewer = (GtkWidget*)constructor(mw_data);
   if(viewer)
   {
     gtk_custom_widget_add(custom, viewer); 
@@ -118,7 +86,7 @@ void get_label(GtkWindow * mw, gchar * str, gchar* dialogue_title, gchar * label
   GtkWidget * label;
   gint id;
 
-  dialogue = gtk_dialog_new_with_buttons(dialogue_title,mw,
+  dialogue = gtk_dialog_new_with_buttons(dialogue_title,NULL,
 					 GTK_DIALOG_MODAL,
 					 GTK_STOCK_OK,GTK_RESPONSE_ACCEPT,
 					 GTK_STOCK_CANCEL,GTK_RESPONSE_REJECT,
@@ -149,7 +117,7 @@ void get_label(GtkWindow * mw, gchar * str, gchar* dialogue_title, gchar * label
 mainWindow * get_window_data_struct(GtkWidget * widget)
 {
   GtkWidget * mw;
-  mainWindow * mwData;
+  mainWindow * mw_data;
 
   mw = lookup_widget(widget, "MWindow");
   if(mw == NULL){
@@ -157,125 +125,24 @@ mainWindow * get_window_data_struct(GtkWidget * widget)
     return;
   }
   
-  mwData = (mainWindow *) g_object_get_data(G_OBJECT(mw),"mainWindow");
-  if(mwData == NULL){
+  mw_data = (mainWindow *) g_object_get_data(G_OBJECT(mw),"mainWindow");
+  if(mw_data == NULL){
     g_printf("Main window data does not exist\n");
     return;
   }
-  return mwData;
+  return mw_data;
 }
 
-void createNewWindow(GtkWidget* widget, gpointer user_data, gboolean clone)
+void create_new_window(GtkWidget* widget, gpointer user_data, gboolean clone)
 {
-  GtkWidget  * mw = NULL; /* Main window */
-  systemView * sv = NULL; /* System view */
-  systemView * newSv;     /* New system view displayed in the new window */
-  GtkWidget  * newWindow; /* New generated main window */
-  mainWindow * newMWindow;/* New main window structure */
-
-  //test
-  int i;
-  GtkWidget * ToolMenuTitle_menu, *insert_view, *pixmap;
-  LttvMenus * menu;
-  LttvToolbars * toolbar;
-  lttv_menu_closure *menuItem;
-  lttv_toolbar_closure *toolbarItem;
-  LttvAttributeValue value;
-  LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
-  view_constructor constructor;
-  GdkPixbuf *pixbuf;
-  //end
-
-  mw = lookup_widget (widget, "MWindow");
-  if(mw == NULL){
-    g_printf("Can not find main window\n");
-    return;
-  }
-  
-  sv = (systemView *)g_object_get_data(G_OBJECT(mw),"systemView");
-  if(sv == NULL){
-    g_printf("Can not find system view\n");
-    return;
-  }  
-    
-  newMWindow = g_new(mainWindow, 1);
-
-  /* Add the object's information to the module's array */
-  Main_Window_List = g_slist_append(Main_Window_List, mw);
-
-  newWindow  = create_MWindow();
-  gtk_widget_show (newWindow);
-  
-  
-  newSv = g_new(systemView, 1);
-  while(sv->Next) sv = sv->Next;
-  sv->Next = newSv;
-
-  newSv->EventDB = NULL;
-  newSv->SystemInfo = NULL;
-  newSv->Options  = NULL;
-  newSv->Next = NULL;
-  newSv->Window = newMWindow;
-
-  newMWindow->MWindow = newWindow;
-  newMWindow->Tab = NULL;
-  newMWindow->CurrentTab = NULL;
-  newMWindow->SystemView = newSv;
-  newMWindow->Attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
-  newMWindow->traceset_context = LTTV_TRACESET_CONTEXT(gTracesetContext);
-  newMWindow->traceset = (LTTV_TRACESET_CONTEXT(gTracesetContext))->ts;
-  g_object_ref(gTracesetContext);
-
-  //test yxx
-  g_assert(lttv_iattribute_find_by_path(attributes,
-	   "viewers/menu", LTTV_POINTER, &value));
-  menu = (LttvMenus*)*(value.v_pointer);
-
-  if(menu){
-    for(i=0;i<menu->len;i++){
-      menuItem = &g_array_index(menu, lttv_menu_closure, i);
-      constructor = menuItem->con;
-      ToolMenuTitle_menu = lookup_widget(newMWindow->MWindow,"ToolMenuTitle_menu");
-      insert_view = gtk_menu_item_new_with_mnemonic (menuItem->menuText);
-      gtk_widget_show (insert_view);
-      gtk_container_add (GTK_CONTAINER (ToolMenuTitle_menu), insert_view);
-      g_signal_connect ((gpointer) insert_view, "activate",
-			G_CALLBACK (insertViewTest),
-			constructor);  
-    }
-  }
-  g_assert(lttv_iattribute_find_by_path(attributes,
-	   "viewers/toolbar", LTTV_POINTER, &value));
-  toolbar = (LttvToolbars*)*(value.v_pointer);
-
-  if(toolbar){
-    for(i=0;i<toolbar->len;i++){
-      toolbarItem = &g_array_index(toolbar, lttv_toolbar_closure, i);
-      constructor = toolbarItem->con;
-      ToolMenuTitle_menu = lookup_widget(newMWindow->MWindow,"MToolbar2");
-      pixbuf = gdk_pixbuf_new_from_xpm_data ((const char**)toolbarItem->pixmap);
-      pixmap = gtk_image_new_from_pixbuf(pixbuf);
-      insert_view = gtk_toolbar_append_element (GTK_TOOLBAR (ToolMenuTitle_menu),
-						GTK_TOOLBAR_CHILD_BUTTON,
-						NULL,
-						"",
-						toolbarItem->tooltip, NULL,
-						pixmap, NULL, NULL);
-      gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (ToolMenuTitle_menu)->children)->data))->label), TRUE);
-      gtk_widget_show (insert_view);
-      gtk_container_set_border_width (GTK_CONTAINER (insert_view), 1);
-      g_signal_connect ((gpointer) insert_view, "clicked",G_CALLBACK (insertViewTest),constructor);       
-    }
-  }
-  //end
-  
-  g_object_set_data(G_OBJECT(newWindow), "systemView", (gpointer)newSv);    
-  g_object_set_data(G_OBJECT(newWindow), "mainWindow", (gpointer)newMWindow);    
+  mainWindow * parent = get_window_data_struct(widget);
 
   if(clone){
     g_printf("Clone : use the same traceset\n");
+    construct_main_window(parent, NULL, FALSE);
   }else{
     g_printf("Empty : traceset is set to NULL\n");
+    construct_main_window(NULL, parent->winCreationData, FALSE);
   }
 }
 
@@ -302,16 +169,110 @@ void delete_viewer(GtkWidget * widget, gpointer user_data)
 
 void open_traceset(GtkWidget * widget, gpointer user_data)
 {
-  g_printf("Open a trace set\n");
+  char ** dir;
+  gint id;
+  LttvTraceset * traceset;
+  mainWindow * mw_data = get_window_data_struct(widget);
+  GtkFileSelection * file_selector = 
+    (GtkFileSelection *)gtk_file_selection_new("Select a traceset");
+
+  gtk_file_selection_hide_fileop_buttons(file_selector);
+  
+  id = gtk_dialog_run(GTK_DIALOG(file_selector));
+  switch(id){
+    case GTK_RESPONSE_ACCEPT:
+    case GTK_RESPONSE_OK:
+      dir = gtk_file_selection_get_selections (file_selector);
+      traceset = lttv_traceset_load(dir[0]);
+      g_printf("Open a trace set %s\n", dir[0]); 
+      //Not finished yet
+      g_strfreev(dir);
+    case GTK_RESPONSE_REJECT:
+    case GTK_RESPONSE_CANCEL:
+    default:
+      gtk_widget_destroy((GtkWidget*)file_selector);
+      break;
+  }
+
 }
 
 void add_trace(GtkWidget * widget, gpointer user_data)
 {
+  LttTrace *trace;
+  LttvTrace * trace_v;
+  LttvTraceset * traceset;
+  char * dir;
+  gint id;
+  mainWindow * mw_data = get_window_data_struct(widget);
+  GtkDirSelection * file_selector = (GtkDirSelection *)gtk_dir_selection_new("Select a trace");
+  gtk_dir_selection_hide_fileop_buttons(file_selector);
+  
+  id = gtk_dialog_run(GTK_DIALOG(file_selector));
+  switch(id){
+    case GTK_RESPONSE_ACCEPT:
+    case GTK_RESPONSE_OK:
+      dir = gtk_dir_selection_get_dir (file_selector);
+      trace = ltt_trace_open(dir);
+      if(trace == NULL) g_critical("cannot open trace %s", dir);
+      trace_v = lttv_trace_new(trace);
+      traceset = mw_data->Traceset_Info->traceset;
+      if(mw_data->Traceset_Info->TracesetContext != NULL){
+	lttv_context_fini(LTTV_TRACESET_CONTEXT(mw_data->Traceset_Info->TracesetContext));
+	g_object_unref(mw_data->Traceset_Info->TracesetContext);
+      }
+      lttv_traceset_add(traceset, trace_v);
+      mw_data->Traceset_Info->TracesetContext =
+  	g_object_new(LTTV_TRACESET_STATS_TYPE, NULL);
+      lttv_context_init(
+	LTTV_TRACESET_CONTEXT(mw_data->Traceset_Info->TracesetContext),traceset);      
+    case GTK_RESPONSE_REJECT:
+    case GTK_RESPONSE_CANCEL:
+    default:
+      gtk_widget_destroy((GtkWidget*)file_selector);
+      break;
+  }
+
   g_printf("add a trace to a trace set\n");
 }
 
 void remove_trace(GtkWidget * widget, gpointer user_data)
 {
+  LttTrace *trace;
+  LttvTrace * trace_v;
+  LttvTraceset * traceset;
+  gint i, nb_trace;
+  char ** name, *remove_trace_name;
+  mainWindow * mw_data = get_window_data_struct(widget);
+  
+  nb_trace =lttv_traceset_number(mw_data->Traceset_Info->traceset); 
+  name = g_new(char*,nb_trace);
+  for(i = 0; i < nb_trace; i++){
+    trace_v = lttv_traceset_get(mw_data->Traceset_Info->traceset, i);
+    trace = lttv_trace(trace_v);
+    name[i] = trace->pathname;
+  }
+
+  remove_trace_name = get_remove_trace(name, nb_trace);
+
+  if(remove_trace_name){
+    for(i=0; i<nb_trace; i++){
+      if(strcmp(remove_trace_name,name[i]) == 0){
+	traceset = mw_data->Traceset_Info->traceset;
+	if(mw_data->Traceset_Info->TracesetContext != NULL){
+	  lttv_context_fini(LTTV_TRACESET_CONTEXT(mw_data->Traceset_Info->TracesetContext));
+	  g_object_unref(mw_data->Traceset_Info->TracesetContext);
+	}
+	lttv_traceset_remove(traceset, i);
+	mw_data->Traceset_Info->TracesetContext =
+	  g_object_new(LTTV_TRACESET_STATS_TYPE, NULL);
+	lttv_context_init(
+	  LTTV_TRACESET_CONTEXT(mw_data->Traceset_Info->TracesetContext),traceset);      
+	break;
+      }
+    }
+  }
+
+  g_free(name);
   g_printf("remove a trace from a trace set\n");
 }
 
@@ -357,7 +318,7 @@ void
 on_empty_traceset_activate             (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  createNewWindow((GtkWidget*)menuitem, user_data, FALSE);
+  create_new_window((GtkWidget*)menuitem, user_data, FALSE);
 }
 
 
@@ -365,7 +326,7 @@ void
 on_clone_traceset_activate             (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  createNewWindow((GtkWidget*)menuitem, user_data, TRUE);
+  create_new_window((GtkWidget*)menuitem, user_data, TRUE);
 }
 
 
@@ -373,58 +334,17 @@ void
 on_tab_activate                        (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  GList * list;
   gchar label[PATH_LENGTH];
-
-  tab * tmpTab;
-  GtkWidget * pane;
-  mainWindow * mwData;
   GtkNotebook * notebook = (GtkNotebook *)lookup_widget((GtkWidget*)menuitem, "MNotebook");
   if(notebook == NULL){
     g_printf("Notebook does not exist\n");
     return;
   }
 
-  mwData = get_window_data_struct((GtkWidget*)menuitem);
-
-  tmpTab = mwData->Tab;
-  while(tmpTab && tmpTab->Next) tmpTab = tmpTab->Next;
-  if(!tmpTab){
-    mwData->CurrentTab = NULL;
-    tmpTab = g_new(tab,1);
-    mwData->Tab = tmpTab;    
-  }else{
-    tmpTab->Next = g_new(tab,1);
-    tmpTab = tmpTab->Next;
-  }
-  if(mwData->CurrentTab){
-    tmpTab->traceStartTime = mwData->CurrentTab->traceStartTime;
-    tmpTab->traceEndTime   = mwData->CurrentTab->traceEndTime;
-    tmpTab->startTime      = mwData->CurrentTab->startTime;
-    tmpTab->endTime        = mwData->CurrentTab->endTime;
-    tmpTab->currentTime    = mwData->CurrentTab->currentTime;
-  }else{
-    getTracesetTimeSpan(mwData,&tmpTab->traceStartTime, &tmpTab->traceEndTime);
-    tmpTab->startTime   = tmpTab->traceStartTime;
-    tmpTab->endTime     = tmpTab->traceEndTime;
-    tmpTab->currentTime = tmpTab->traceStartTime;
-  }
-  tmpTab->Attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
-  //  mwData->CurrentTab = tmpTab;
-  tmpTab->custom = (GtkCustom*)gtk_custom_new();
-  tmpTab->custom->mw = mwData;
-  gtk_widget_show((GtkWidget*)tmpTab->custom);
-  tmpTab->Next = NULL;    
-
   strcpy(label,"Page");
-  get_label((GtkWindow*)mwData->MWindow, label,"Get the name of the tab","Please input tab's name");
-  tmpTab->label = gtk_label_new (label);
-  gtk_widget_show (tmpTab->label);
+  get_label(NULL, label,"Get the name of the tab","Please input tab's name");
 
-  gtk_notebook_append_page(notebook, (GtkWidget*)tmpTab->custom, tmpTab->label); 
-  
-  list = gtk_container_get_children(GTK_CONTAINER(notebook));
-  gtk_notebook_set_current_page(notebook,g_list_length(list)-1);
+  create_tab ((GtkWidget*)menuitem, notebook, label);
 }
 
 
@@ -440,7 +360,8 @@ void
 on_close_activate                      (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  g_printf("Close\n");
+  mainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
+  main_window_destructor(mw_data);  
 }
 
 
@@ -448,7 +369,30 @@ void
 on_close_tab_activate                  (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  g_printf("Close tab\n");
+  int count = 0;
+  GtkWidget * notebook;
+  tab * tmp;
+  mainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
+  notebook = lookup_widget((GtkWidget*)menuitem, "MNotebook");
+  if(notebook == NULL){
+    g_printf("Notebook does not exist\n");
+    return;
+  }
+  
+  if(mw_data->Tab == mw_data->CurrentTab){
+    //    tmp = mw_data->CurrentTab;
+    //    mw_data->Tab = mw_data->CurrentTab->Next;
+    g_printf("The default TAB can not be deleted\n");
+    return;
+  }else{
+    tmp = mw_data->Tab;
+    while(tmp != mw_data->CurrentTab){
+      tmp = tmp->Next;
+      count++;
+    }
+  }
+
+  gtk_notebook_remove_page((GtkNotebook*)notebook, count);  
 }
 
 
@@ -488,7 +432,7 @@ void
 on_quit_activate                       (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  on_MWindow_destroy(GTK_OBJECT(menuitem), user_data);
+  gtk_main_quit ();
 }
 
 
@@ -592,7 +536,39 @@ void
 on_load_module_activate                (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  g_printf("Load module\n");
+  char ** dir;
+  gint id;
+  char str[PATH_LENGTH], *str1;
+  mainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
+  GtkFileSelection * file_selector = (GtkFileSelection *)gtk_file_selection_new("Select a module");
+  gtk_file_selection_hide_fileop_buttons(file_selector);
+  
+  str[0] = '\0';
+  id = gtk_dialog_run(GTK_DIALOG(file_selector));
+  switch(id){
+    case GTK_RESPONSE_ACCEPT:
+    case GTK_RESPONSE_OK:
+      dir = gtk_file_selection_get_selections (file_selector);
+      sprintf(str,dir[0]);
+      str1 = strrchr(str,'/');
+      if(str1)str1++;
+      else{
+	str1 = strrchr(str,'\\');
+	str1++;
+      }
+      if(mw_data->winCreationData)
+	lttv_module_load(str1, mw_data->winCreationData->argc,mw_data->winCreationData->argv);
+      else
+	lttv_module_load(str1, 0,NULL);
+      g_slist_foreach(g_main_window_list, insert_menu_toolbar_item, NULL);
+      g_strfreev(dir);
+    case GTK_RESPONSE_REJECT:
+    case GTK_RESPONSE_CANCEL:
+    default:
+      gtk_widget_destroy((GtkWidget*)file_selector);
+      break;
+  }
+  g_printf("Load module: %s\n", str);
 }
 
 
@@ -600,7 +576,31 @@ void
 on_unload_module_activate              (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  g_printf("Unload module\n");
+  int i;
+  char **name, *unload_module_name;
+  guint nb;
+  LttvModule ** modules, *module;
+  mainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
+  
+  modules = lttv_module_list(&nb);
+  name  = g_new(char*, nb);
+  for(i=0;i<nb;i++){
+    module = modules[i];
+    name[i] = lttv_module_name(module);
+  }
+
+  unload_module_name =get_unload_module(name,nb);
+  
+  if(unload_module_name){
+    for(i=0;i<nb;i++){
+      if(strcmp(unload_module_name, name[i]) == 0){
+	lttv_module_unload(modules[i]);
+	break;
+      }
+    }    
+  }
+
+  g_free(name);
 }
 
 
@@ -608,13 +608,23 @@ void
 on_add_module_search_path_activate     (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  gchar  str[PATH_LENGTH];
-  mainWindow * mwData = get_window_data_struct((GtkWidget*)menuitem);
-  g_printf("Add module search path\n");
-  str[0] = '\0';
-  get_label((GtkWindow*)mwData->MWindow, str, "Add module search path", "Please input a search path:");
-  if(strlen(str)){
-    lttv_module_path_add(str);
+  GtkDirSelection * file_selector = (GtkDirSelection *)gtk_dir_selection_new("Select module path");
+  char * dir;
+  gint id;
+
+  mainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
+
+  id = gtk_dialog_run(GTK_DIALOG(file_selector));
+  switch(id){
+    case GTK_RESPONSE_ACCEPT:
+    case GTK_RESPONSE_OK:
+      dir = gtk_dir_selection_get_dir (file_selector);
+      lttv_module_path_add(dir);
+    case GTK_RESPONSE_REJECT:
+    case GTK_RESPONSE_CANCEL:
+    default:
+      gtk_widget_destroy((GtkWidget*)file_selector);
+      break;
   }
 }
 
@@ -663,7 +673,7 @@ void
 on_button_new_clicked                  (GtkButton       *button,
                                         gpointer         user_data)
 {
-  createNewWindow((GtkWidget*)button, user_data, FALSE);
+  create_new_window((GtkWidget*)button, user_data, FALSE);
 }
 
 
@@ -774,16 +784,13 @@ void
 on_MWindow_destroy                     (GtkObject       *object,
                                         gpointer         user_data)
 {
-  systemView * sv = gSysView;
-  gint count = 0;
-  while(sv->Next){
-    g_printf("There are : %d windows\n",++count);
-    sv = sv->Next;
-  }
-  g_printf("There are : %d windows\n",++count);
+  mainWindow *Main_Window = (mainWindow*)user_data;
   
-  gtk_main_quit ();
+  g_printf("There are : %d windows\n",g_slist_length(g_main_window_list));
 
+  g_win_count--;
+  if(g_win_count == 0)
+    gtk_main_quit ();
 }
 
 
@@ -803,3 +810,447 @@ on_MNotebook_switch_page               (GtkNotebook     *notebook,
   mw->CurrentTab = Tab;
 }
 
+char * get_remove_trace(char ** all_trace_name, int nb_trace)
+{
+  return get_selection(all_trace_name, nb_trace, 
+		       "Select a trace", "Trace pathname");
+}
+char * get_unload_module(char ** loaded_module_name, int nb_module)
+{
+  return get_selection(loaded_module_name, nb_module, 
+		       "Select an unload module", "Module pathname");
+}
+
+char * get_selection(char ** loaded_module_name, int nb_module,
+		     char *title, char * column_title)
+{
+  GtkWidget         * dialogue;
+  GtkWidget         * scroll_win;
+  GtkWidget         * tree;
+  GtkListStore      * store;
+  GtkTreeViewColumn * column;
+  GtkCellRenderer   * renderer;
+  GtkTreeSelection  * select;
+  GtkTreeIter         iter;
+  gint                id, i;
+  char              * unload_module_name = NULL;
+
+  dialogue = gtk_dialog_new_with_buttons(title,
+					 NULL,
+					 GTK_DIALOG_MODAL,
+					 GTK_STOCK_OK,GTK_RESPONSE_ACCEPT,
+					 GTK_STOCK_CANCEL,GTK_RESPONSE_REJECT,
+					 NULL); 
+  gtk_window_set_default_size((GtkWindow*)dialogue, 500, 200);
+
+  scroll_win = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_show ( scroll_win);
+  gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll_win), 
+				 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
+  store = gtk_list_store_new (N_COLUMNS,G_TYPE_STRING);
+  tree = gtk_tree_view_new_with_model(GTK_TREE_MODEL (store));
+  gtk_widget_show ( tree);
+  g_object_unref (G_OBJECT (store));
+		
+  renderer = gtk_cell_renderer_text_new ();
+  column   = gtk_tree_view_column_new_with_attributes (column_title,
+						     renderer,
+						     "text", MODULE_COLUMN,
+						     NULL);
+  gtk_tree_view_column_set_alignment (column, 0.5);
+  gtk_tree_view_column_set_fixed_width (column, 150);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
+
+  select = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree));
+  gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE);
+
+  gtk_container_add (GTK_CONTAINER (scroll_win), tree);  
+
+  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialogue)->vbox), scroll_win,TRUE, TRUE,0);
+
+  for(i=0;i<nb_module;i++){
+    gtk_list_store_append (store, &iter);
+    gtk_list_store_set (store, &iter, MODULE_COLUMN,loaded_module_name[i],-1);
+  }
+
+  id = gtk_dialog_run(GTK_DIALOG(dialogue));
+  switch(id){
+    case GTK_RESPONSE_ACCEPT:
+    case GTK_RESPONSE_OK:
+      if (gtk_tree_selection_get_selected (select, (GtkTreeModel**)&store, &iter)){
+	  gtk_tree_model_get ((GtkTreeModel*)store, &iter, MODULE_COLUMN, &unload_module_name, -1);
+      }
+    case GTK_RESPONSE_REJECT:
+    case GTK_RESPONSE_CANCEL:
+    default:
+      gtk_widget_destroy(dialogue);
+      break;
+  }
+
+  return unload_module_name;
+}
+
+void main_window_destroy_hash_key(gpointer key)
+{
+  g_free(key);
+}
+
+void main_window_destroy_hash_data(gpointer data)
+{
+}
+
+
+void insert_menu_toolbar_item(mainWindow * mw, gpointer user_data)
+{
+  int i;
+  GdkPixbuf *pixbuf;
+  view_constructor constructor;
+  LttvMenus * menu;
+  LttvToolbars * toolbar;
+  lttv_menu_closure *menu_item;
+  lttv_toolbar_closure *toolbar_item;
+  LttvAttributeValue value;
+  LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
+  GtkWidget * tool_menu_title_menu, *insert_view, *pixmap, *tmp;
+
+  g_assert(lttv_iattribute_find_by_path(attributes,
+	   "viewers/menu", LTTV_POINTER, &value));
+  menu = (LttvMenus*)*(value.v_pointer);
+
+  if(menu){
+    for(i=0;i<menu->len;i++){
+      menu_item = &g_array_index(menu, lttv_menu_closure, i);
+      tmp = g_hash_table_lookup(mw->hash_menu_item, g_strdup(menu_item->menuText));
+      if(tmp)continue;
+      constructor = menu_item->con;
+      tool_menu_title_menu = lookup_widget(mw->MWindow,"ToolMenuTitle_menu");
+      insert_view = gtk_menu_item_new_with_mnemonic (menu_item->menuText);
+      gtk_widget_show (insert_view);
+      gtk_container_add (GTK_CONTAINER (tool_menu_title_menu), insert_view);
+      g_signal_connect ((gpointer) insert_view, "activate",
+			G_CALLBACK (insert_viewer_wrap),
+			constructor);  
+      g_hash_table_insert(mw->hash_menu_item, g_strdup(menu_item->menuText),
+			  insert_view);
+    }
+  }
+
+  g_assert(lttv_iattribute_find_by_path(attributes,
+	   "viewers/toolbar", LTTV_POINTER, &value));
+  toolbar = (LttvToolbars*)*(value.v_pointer);
+
+  if(toolbar){
+    for(i=0;i<toolbar->len;i++){
+      toolbar_item = &g_array_index(toolbar, lttv_toolbar_closure, i);
+      tmp = g_hash_table_lookup(mw->hash_toolbar_item, g_strdup(toolbar_item->tooltip));
+      if(tmp)continue;
+      constructor = toolbar_item->con;
+      tool_menu_title_menu = lookup_widget(mw->MWindow,"MToolbar2");
+      pixbuf = gdk_pixbuf_new_from_xpm_data ((const char**)toolbar_item->pixmap);
+      pixmap = gtk_image_new_from_pixbuf(pixbuf);
+      insert_view = gtk_toolbar_append_element (GTK_TOOLBAR (tool_menu_title_menu),
+						GTK_TOOLBAR_CHILD_BUTTON,
+						NULL,
+						"",
+						toolbar_item->tooltip, NULL,
+						pixmap, NULL, NULL);
+      gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (tool_menu_title_menu)->children)->data))->label), TRUE);
+      gtk_widget_show (insert_view);
+      gtk_container_set_border_width (GTK_CONTAINER (insert_view), 1);
+      g_signal_connect ((gpointer) insert_view, "clicked",G_CALLBACK (insert_viewer_wrap),constructor);       
+      g_hash_table_insert(mw->hash_toolbar_item, g_strdup(toolbar_item->tooltip),
+			  insert_view);
+    }
+  }
+}
+
+void construct_main_window(mainWindow * parent, WindowCreationData * win_creation_data,
+		      gboolean first_window)
+{
+  g_critical("construct_main_window()");
+  GtkWidget  * new_window; /* New generated main window */
+  mainWindow * new_m_window;/* New main window structure */
+  GtkNotebook * notebook;
+  LttvIAttribute *attributes =
+	  LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
+  LttvAttributeValue value;
+         
+  new_m_window = g_new(mainWindow, 1);
+
+  // Add the object's information to the module's array 
+  g_main_window_list = g_slist_append(g_main_window_list, new_m_window);
+
+
+  new_window  = create_MWindow();
+  gtk_widget_show (new_window);
+    
+  new_m_window->Attributes = attributes;
+  
+  new_m_window->Traceset_Info = g_new(TracesetInfo,1);
+  new_m_window->Traceset_Info->path = NULL ;
+
+
+  new_m_window->Traceset_Info->before_traceset = lttv_hooks_new();
+  new_m_window->Traceset_Info->after_traceset = lttv_hooks_new();
+  new_m_window->Traceset_Info->before_trace = lttv_hooks_new();
+  new_m_window->Traceset_Info->after_trace = lttv_hooks_new();
+  new_m_window->Traceset_Info->before_tracefile = lttv_hooks_new();
+  new_m_window->Traceset_Info->after_tracefile = lttv_hooks_new();
+  new_m_window->Traceset_Info->before_event = lttv_hooks_new();
+  new_m_window->Traceset_Info->after_event = lttv_hooks_new();
+
+  g_assert(lttv_iattribute_find_by_path(attributes, "hooks/traceset/before",
+      LTTV_POINTER, &value));
+  *(value.v_pointer) = new_m_window->Traceset_Info->before_traceset;
+  g_assert(lttv_iattribute_find_by_path(attributes, "hooks/traceset/after",
+      LTTV_POINTER, &value));
+  *(value.v_pointer) = new_m_window->Traceset_Info->after_traceset;
+  g_assert(lttv_iattribute_find_by_path(attributes, "hooks/trace/before",
+      LTTV_POINTER, &value));
+  *(value.v_pointer) = new_m_window->Traceset_Info->before_trace;
+  g_assert(lttv_iattribute_find_by_path(attributes, "hooks/trace/after",
+      LTTV_POINTER, &value));
+  *(value.v_pointer) = new_m_window->Traceset_Info->after_trace;
+  g_assert(lttv_iattribute_find_by_path(attributes, "hooks/tracefile/before",
+      LTTV_POINTER, &value));
+  *(value.v_pointer) = new_m_window->Traceset_Info->before_tracefile;
+  g_assert(lttv_iattribute_find_by_path(attributes, "hooks/tracefile/after",
+      LTTV_POINTER, &value));
+  *(value.v_pointer) = new_m_window->Traceset_Info->after_tracefile;
+  g_assert(lttv_iattribute_find_by_path(attributes, "hooks/event/before",
+      LTTV_POINTER, &value));
+  *(value.v_pointer) = new_m_window->Traceset_Info->before_event;
+  g_assert(lttv_iattribute_find_by_path(attributes, "hooks/event/after",
+      LTTV_POINTER, &value));
+  *(value.v_pointer) = new_m_window->Traceset_Info->after_event;
+ 
+  
+  new_m_window->MWindow = new_window;
+  new_m_window->Tab = NULL;
+  new_m_window->CurrentTab = NULL;
+  new_m_window->Attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
+  if(parent){
+    new_m_window->Traceset_Info->traceset = 
+        lttv_traceset_copy(parent->Traceset_Info->traceset);
+    
+//FIXME copy not implemented in lower level
+    new_m_window->Traceset_Info->TracesetContext =
+  	g_object_new(LTTV_TRACESET_STATS_TYPE, NULL);
+    lttv_context_init(
+	LTTV_TRACESET_CONTEXT(new_m_window->Traceset_Info->TracesetContext),
+	new_m_window->Traceset_Info->traceset);
+  //new_m_window->traceset_context = parent->traceset_context;
+    new_m_window->winCreationData = parent->winCreationData;
+  }else{
+    new_m_window->Traceset_Info->traceset = lttv_traceset_new();
+
+    /* Add the command line trace */
+    if(g_init_trace != NULL && first_window)
+      lttv_traceset_add(new_m_window->Traceset_Info->traceset, g_init_trace);
+    /* NOTE : the context must be recreated if we change the traceset,
+     * ie : adding/removing traces */
+    new_m_window->Traceset_Info->TracesetContext =
+  	g_object_new(LTTV_TRACESET_STATS_TYPE, NULL);
+    lttv_context_init(
+	LTTV_TRACESET_CONTEXT(new_m_window->Traceset_Info->TracesetContext),
+	new_m_window->Traceset_Info->traceset);
+
+    new_m_window->winCreationData = win_creation_data;
+  }
+
+  new_m_window->hash_menu_item = g_hash_table_new_full (g_str_hash, g_str_equal,
+					      main_window_destroy_hash_key, 
+					      main_window_destroy_hash_data);
+  new_m_window->hash_toolbar_item = g_hash_table_new_full (g_str_hash, g_str_equal,
+					      main_window_destroy_hash_key, 
+					      main_window_destroy_hash_data);
+
+  insert_menu_toolbar_item(new_m_window, NULL);
+  
+  g_object_set_data(G_OBJECT(new_window), "mainWindow", (gpointer)new_m_window);    
+
+  //create a default tab
+  notebook = (GtkNotebook *)lookup_widget(new_m_window->MWindow, "MNotebook");
+  if(notebook == NULL){
+    g_printf("Notebook does not exist\n");
+    return;
+  }
+  //for now there is no name field in LttvTraceset structure
+  //Use "Traceset" as the label for the default tab
+  create_tab(new_m_window->MWindow, notebook,"Traceset");
+
+  g_object_set_data_full(
+			G_OBJECT(new_m_window->MWindow),
+			"Main_Window_Data",
+			new_m_window,
+			(GDestroyNotify)main_window_free);
+
+  g_win_count++;
+}
+
+void tab_destructor(tab * tab_instance)
+{
+  if(tab_instance->Attributes)
+    g_object_unref(tab_instance->Attributes);  
+
+  if(tab_instance->mw->Tab == tab_instance){
+    tab_instance->mw->Tab = tab_instance->Next;
+  }else{
+    tab * tmp1, *tmp = tab_instance->mw->Tab;
+    while(tmp != tab_instance){
+      tmp1 = tmp;
+      tmp = tmp->Next;
+    }
+    tmp1->Next = tab_instance->Next;
+  }
+  g_free(tab_instance);
+}
+
+void * create_tab(GtkWidget* parent, GtkNotebook * notebook, char * label)
+{
+  GList * list;
+  tab * tmp_tab;
+  mainWindow * mw_data;
+  LttTime tmp_time;
+
+  mw_data = get_window_data_struct(parent);
+  tmp_tab = mw_data->Tab;
+  while(tmp_tab && tmp_tab->Next) tmp_tab = tmp_tab->Next;
+  if(!tmp_tab){
+    mw_data->CurrentTab = NULL;
+    tmp_tab = g_new(tab,1);
+    mw_data->Tab = tmp_tab;    
+  }else{
+    tmp_tab->Next = g_new(tab,1);
+    tmp_tab = tmp_tab->Next;
+  }
+  if(mw_data->CurrentTab){
+ // Will have to read directly at the main window level, as we want
+ // to be able to modify a traceset on the fly.
+ //   tmp_tab->traceStartTime = mw_data->CurrentTab->traceStartTime;
+ //   tmp_tab->traceEndTime   = mw_data->CurrentTab->traceEndTime;
+    tmp_tab->Time_Window      = mw_data->CurrentTab->Time_Window;
+    tmp_tab->currentTime    = mw_data->CurrentTab->currentTime;
+  }else{
+ // Will have to read directly at the main window level, as we want
+ // to be able to modify a traceset on the fly.
+  //  getTracesetTimeSpan(mw_data,&tmp_tab->traceStartTime, &tmp_tab->traceEndTime);
+    tmp_tab->Time_Window.startTime   = 
+	    LTTV_TRACESET_CONTEXT(mw_data->Traceset_Info->TracesetContext)->Time_Span->startTime;
+    if(DEFAULT_TIME_WIDTH_S <
+              LTTV_TRACESET_CONTEXT(mw_data->Traceset_Info->TracesetContext)->Time_Span->endTime.tv_sec)
+      tmp_time.tv_sec = DEFAULT_TIME_WIDTH_S;
+    else
+      tmp_time.tv_sec =
+              LTTV_TRACESET_CONTEXT(mw_data->Traceset_Info->TracesetContext)->Time_Span->endTime.tv_sec;
+    tmp_time.tv_nsec = 0;
+    tmp_tab->Time_Window.Time_Width = tmp_time ;
+    tmp_tab->currentTime.tv_sec = tmp_time.tv_sec / 2;
+    tmp_tab->currentTime.tv_nsec = 0 ;
+  }
+  tmp_tab->Attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
+  //  mw_data->CurrentTab = tmp_tab;
+  tmp_tab->custom = (GtkCustom*)gtk_custom_new();
+  tmp_tab->custom->mw = mw_data;
+  gtk_widget_show((GtkWidget*)tmp_tab->custom);
+  tmp_tab->Next = NULL;    
+  tmp_tab->mw   = mw_data;
+
+  tmp_tab->label = gtk_label_new (label);
+  gtk_widget_show (tmp_tab->label);
+
+  g_object_set_data_full(
+           G_OBJECT(tmp_tab->custom),
+           "Tab_Info",
+	   tmp_tab,
+	   (GDestroyNotify)tab_destructor);
+  
+  gtk_notebook_append_page(notebook, (GtkWidget*)tmp_tab->custom, tmp_tab->label);  
+  list = gtk_container_get_children(GTK_CONTAINER(notebook));
+  gtk_notebook_set_current_page(notebook,g_list_length(list)-1);
+}
+
+void remove_menu_item(gpointer main_win, gpointer user_data)
+{
+  mainWindow * mw = (mainWindow *) main_win;
+  lttv_menu_closure *menu_item = (lttv_menu_closure *)user_data;
+  GtkWidget * tool_menu_title_menu, *insert_view;
+
+  tool_menu_title_menu = lookup_widget(mw->MWindow,"ToolMenuTitle_menu");
+  insert_view = (GtkWidget*)g_hash_table_lookup(mw->hash_menu_item,
+						menu_item->menuText);
+  if(insert_view){
+    g_hash_table_remove(mw->hash_menu_item, menu_item->menuText);
+    gtk_container_remove (GTK_CONTAINER (tool_menu_title_menu), insert_view);
+  }
+}
+
+void remove_toolbar_item(gpointer main_win, gpointer user_data)
+{
+  mainWindow * mw = (mainWindow *) main_win;
+  lttv_toolbar_closure *toolbar_item = (lttv_toolbar_closure *)user_data;
+  GtkWidget * tool_menu_title_menu, *insert_view;
+
+
+  tool_menu_title_menu = lookup_widget(mw->MWindow,"MToolbar2");
+  insert_view = (GtkWidget*)g_hash_table_lookup(mw->hash_toolbar_item,
+						toolbar_item->tooltip);
+  if(insert_view){
+    g_hash_table_remove(mw->hash_toolbar_item, toolbar_item->tooltip);
+    gtk_container_remove (GTK_CONTAINER (tool_menu_title_menu), insert_view);
+  }
+}
+
+/**
+ * Remove menu and toolbar item when a module unloaded
+ */
+
+void main_window_remove_menu_item(lttv_constructor constructor)
+{
+  int i;
+  LttvMenus * menu;
+  lttv_menu_closure *menu_item;
+  LttvAttributeValue value;
+  LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
+
+  g_assert(lttv_iattribute_find_by_path(attributes,
+	   "viewers/menu", LTTV_POINTER, &value));
+  menu = (LttvMenus*)*(value.v_pointer);
+
+  if(menu){
+    for(i=0;i<menu->len;i++){
+      menu_item = &g_array_index(menu, lttv_menu_closure, i);
+      if(menu_item->con != constructor) continue;
+      if(g_main_window_list){
+	g_slist_foreach(g_main_window_list, remove_menu_item, menu_item);
+      }
+      break;
+    }
+  }
+  
+}
+
+void main_window_remove_toolbar_item(lttv_constructor constructor)
+{
+  int i;
+  LttvToolbars * toolbar;
+  lttv_toolbar_closure *toolbar_item;
+  LttvAttributeValue value;
+  LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
+
+  g_assert(lttv_iattribute_find_by_path(attributes,
+	   "viewers/toolbar", LTTV_POINTER, &value));
+  toolbar = (LttvToolbars*)*(value.v_pointer);
+
+  if(toolbar){
+    for(i=0;i<toolbar->len;i++){
+      toolbar_item = &g_array_index(toolbar, lttv_toolbar_closure, i);
+      if(toolbar_item->con != constructor) continue;
+      if(g_main_window_list){
+	g_slist_foreach(g_main_window_list, remove_toolbar_item, toolbar_item);
+      }
+      break;
+    }
+  }
+}