X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Finclude%2Flttv%2FmainWindow.h;h=4103f72698076f49b0d47dd2ab8b6d9e50b956e5;hb=b6374ffa885352d25b2bf20233b7e8a5daf15552;hp=391cef0fae8e074d187a58434175fcd44e51de59;hpb=7a859036ac53f538bd0ff723a1b450d7f26fa733;p=lttv.git

diff --git a/ltt/branches/poly/include/lttv/mainWindow.h b/ltt/branches/poly/include/lttv/mainWindow.h
index 391cef0f..4103f726 100644
--- a/ltt/branches/poly/include/lttv/mainWindow.h
+++ b/ltt/branches/poly/include/lttv/mainWindow.h
@@ -9,16 +9,26 @@
 #include <lttv/processTrace.h>
 
 #include <lttv/common.h>
-#include <lttv/gtkcustom.h>
+#include <lttv/gtkmultivpaned.h>
+#include <lttv/hook.h>
+#include <lttv/stats.h>
 
 typedef struct _WindowCreationData {
 	int argc;
 	char ** argv;
 } WindowCreationData;
 
-struct _mainWindow{
-  GtkWidget*      MWindow;            /* Main Window */
-  systemView *    SystemView;         /* System view displayed in this window*/
+
+typedef struct _TracesetInfo {
+  //FIXME? TracesetContext and stats in same or different variable ?
+  LttvTracesetStats * traceset_context;
+  LttvTraceset * traceset;
+} TracesetInfo ;
+
+
+struct _MainWindow{
+  GtkWidget*      mwindow;            /* Main Window */
+  int             window_width;
 
   /* Status bar information */
   //  guint         MainSBarContextID;    /* Context ID of main status bar */
@@ -30,44 +40,51 @@ struct _mainWindow{
   //viewTimeFrameWindow* ViewTimeFrameWindow;/*Window to select time frame */
   //gotoEventWindow*     GotoEventWindow; /*search for event description*/
   //openFilterWindow*    OpenFilterWindow; /* Open a filter selection window */
-  GtkWidget*           HelpContents;/* Window to display help contents */
-  GtkWidget*           AboutBox;    /* Window  about information */
+  GtkWidget*           help_contents;/* Window to display help contents */
+  GtkWidget*           about_box;    /* Window  about information */
  
-  LttvTracesetContext * traceset_context; 
-  LttvTraceset * traceset;  /* trace set associated with the window */
   //  lttv_trace_filter * filter; /* trace filter associated with the window */
+
+  /* Attributes for trace reading hooks local to the main window */
+  LttvIAttribute * attributes;
   
+  Tab * tab;
+  Tab * current_tab;
 
-  tab * Tab;
-  tab * CurrentTab;
-  LttvIAttribute * Attributes;
+  WindowCreationData * win_creation_data; 
 
-  WindowCreationData * winCreationData; 
+  GHashTable * hash_menu_item;
+  GHashTable * hash_toolbar_item;
 };
 
 
-struct _systemView{
-  gpointer             EventDB;
-  gpointer             SystemInfo;
-  gpointer             Options;
-  mainWindow         * Window;
-  struct _systemView * Next;
-};
-
-struct _tab{
+struct _Tab{
   GtkWidget * label;
-  GtkCustom * custom;
+  GtkMultiVPaned * multi_vpaned;
+   
+  // startTime is the left of the visible area. Corresponds to the scrollbar
+  // value.
+  // Time_Width is a zoom dependant value (corresponding to page size)
+  TimeWindow time_window;
+  
+  // The current time is the time selected in the visible area by the user,
+  // not the scrollbar value.
+  LttTime current_time;
+  LttvIAttribute * attributes;
 
-  LttTime traceStartTime;
-  LttTime traceEndTime;
-  LttTime startTime;
-  LttTime endTime;
-  LttTime currentTime;
-  LttvIAttribute * Attributes;
+  struct _Tab * next;
+  MainWindow  * mw;
 
-  struct _tab * Next;
+  /* Traceset related information */
+  TracesetInfo * traceset_info; 
 };
 
+/**
+ * Remove menu and toolbar item when a module unloaded
+ */
+void main_window_remove_menu_item(lttv_constructor view_constructor);
+void main_window_remove_toolbar_item(lttv_constructor view_constructor);
+
 #endif /* _MAIN_WINDOW_ */