X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2FmainWin%2Fsrc%2Fcallbacks.c;h=53a2770fe43f2fbca4a0b8c3174bb297adda6329;hb=ec25ff5e1b6c8930417825d7914cabb03fe75b34;hp=7df9aa1378769735bdea5880b93cb12563c26b78;hpb=bd4bd78f28f4743fb865d47d9f2e1537c774b752;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 7df9aa13..53a2770f 100644
--- a/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c
+++ b/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c
@@ -8,14 +8,15 @@
 #include "callbacks.h"
 #include "interface.h"
 #include "support.h"
-#include "mainWindow.h"
-
+#include <lttv/mainWindow.h>
+#include <lttv/menu.h>
+#include <lttv/toolbar.h>
 
 extern systemView * gSysView;
+extern LttvTracesetContext * gTracesetContext;
 
-typedef void (*call_Event_Selected_Hook)(void * call_data);
-extern call_Event_Selected_Hook selected_hook;
-extern view_constructor gConstructor;
+/** Array containing instanced objects. */
+extern GSList * Main_Window_List;
 
 mainWindow * get_window_data_struct(GtkWidget * widget);
 
@@ -37,8 +38,8 @@ void
 insertViewTest(GtkMenuItem *menuitem, gpointer user_data)
 {
   guint val = 20;
-  insertView((GtkWidget*)menuitem, gConstructor);
-  selected_hook(&val);
+  insertView((GtkWidget*)menuitem, (view_constructor)user_data);
+  //  selected_hook(&val);
 }
 
 void
@@ -164,7 +165,16 @@ void createNewWindow(GtkWidget* widget, gpointer user_data, gboolean clone)
   mainWindow * newMWindow;/* New main window structure */
 
   //test
-  GtkWidget * ToolMenuTitle_menu, *insert_view;
+  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");
@@ -180,6 +190,10 @@ void createNewWindow(GtkWidget* widget, gpointer user_data, gboolean clone)
   }  
     
   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);
   
@@ -198,16 +212,52 @@ void createNewWindow(GtkWidget* widget, gpointer user_data, gboolean clone)
   newMWindow->Tab = NULL;
   newMWindow->CurrentTab = NULL;
   newMWindow->SystemView = newSv;
-  //  newMWindow->Attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
+  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
-  ToolMenuTitle_menu = lookup_widget(newMWindow->MWindow,"ToolMenuTitle_menu");
-  insert_view = gtk_menu_item_new_with_mnemonic ("insert_view");
-  gtk_widget_show (insert_view);
-  gtk_container_add (GTK_CONTAINER (ToolMenuTitle_menu), insert_view);
-  g_signal_connect ((gpointer) insert_view, "activate",
-                    G_CALLBACK (insertViewTest),
-                    NULL);  
+  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);    
@@ -331,12 +381,31 @@ on_tab_activate                        (GtkMenuItem     *menuitem,
   tmpTab = mwData->Tab;
   while(tmpTab && tmpTab->Next) tmpTab = tmpTab->Next;
   if(!tmpTab){
+    mwData->CurrentTab = NULL;
     tmpTab = g_new(tab,1);
-    mwData->Tab = tmpTab;
+    tmpTab->traceStartTime.tv_sec  = 0;
+    tmpTab->traceStartTime.tv_nsec = 0;
+    tmpTab->traceEndTime.tv_sec    = G_MAXULONG;
+    tmpTab->traceEndTime.tv_nsec   = G_MAXULONG;
+    tmpTab->startTime.tv_sec       = 0;
+    tmpTab->startTime.tv_nsec      = 0;
+    tmpTab->endTime.tv_sec         = G_MAXULONG;
+    tmpTab->endTime.tv_nsec        = G_MAXULONG;
+    tmpTab->currentTime.tv_sec     = 0;
+    tmpTab->currentTime.tv_nsec    = 0;
+    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;
+  }
+  tmpTab->Attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
   //  mwData->CurrentTab = tmpTab;
   tmpTab->custom = (GtkCustom*)gtk_custom_new();
   gtk_widget_show((GtkWidget*)tmpTab->custom);