#include "callbacks.h"
#include "interface.h"
#include "support.h"
-#include "mainWindow.h"
-
+#include <lttv/mainWindow.h>
+#include <lttv/menu.h>
+#include <lttv/toolbar.h>
+#include <lttv/gtkTraceSet.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);
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
{
GtkCustom * custom;
mainWindow * mwData;
+ GtkWidget * viewer;
mwData = get_window_data_struct(widget);
if(!mwData->CurrentTab) return;
custom = mwData->CurrentTab->custom;
- gtk_custom_widget_add(custom, (GtkWidget*)constructor(mwData));
+ viewer = (GtkWidget*)constructor(mwData);
+ if(viewer)
+ {
+ gtk_custom_widget_add(custom, viewer);
+ // Added by MD
+ // g_object_unref(G_OBJECT(viewer));
+ }
}
void get_label_string (GtkWidget * text, gchar * label)
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");
}
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);
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);
tmpTab = mwData->Tab;
while(tmpTab && tmpTab->Next) tmpTab = tmpTab->Next;
if(!tmpTab){
+ mwData->CurrentTab = NULL;
tmpTab = g_new(tab,1);
- mwData->Tab = tmpTab;
+ 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;