X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Finclude%2Flttv%2FmainWindow.h;h=4103f72698076f49b0d47dd2ab8b6d9e50b956e5;hb=bca085a1630564856dc74dfe33815622c5a43e9f;hp=dc0254f1259a1b684ad674a872edcd59dd588c0c;hpb=2061e03dd5e8aa09fbed5b08ae702fe2eb33be06;p=lttv.git

diff --git a/ltt/branches/poly/include/lttv/mainWindow.h b/ltt/branches/poly/include/lttv/mainWindow.h
index dc0254f1..4103f726 100644
--- a/ltt/branches/poly/include/lttv/mainWindow.h
+++ b/ltt/branches/poly/include/lttv/mainWindow.h
@@ -9,7 +9,7 @@
 #include <lttv/processTrace.h>
 
 #include <lttv/common.h>
-#include <lttv/gtkcustom.h>
+#include <lttv/gtkmultivpaned.h>
 #include <lttv/hook.h>
 #include <lttv/stats.h>
 
@@ -18,30 +18,17 @@ typedef struct _WindowCreationData {
 	char ** argv;
 } WindowCreationData;
 
-typedef struct _TimeWindow {
-	LttTime startTime;
-	LttTime Time_Width;
-} TimeWindow;
 
 typedef struct _TracesetInfo {
-	gchar* path;
-	LttvHooks 
-	  *before_traceset,
-	  *after_traceset,
-	  *before_trace,
-	  *after_trace,
-	  *before_tracefile,
-	  *after_tracefile,
-	  *before_event,
-	  *after_event;
-        //FIXME? TracesetContext and stats in same or different variable ?
-	LttvTracesetStats * TracesetContext;
-	LttvTraceset * traceset;
+  //FIXME? TracesetContext and stats in same or different variable ?
+  LttvTracesetStats * traceset_context;
+  LttvTraceset * traceset;
 } TracesetInfo ;
 
 
-struct _mainWindow{
-  GtkWidget*      MWindow;            /* Main Window */
+struct _MainWindow{
+  GtkWidget*      mwindow;            /* Main Window */
+  int             window_width;
 
   /* Status bar information */
   //  guint         MainSBarContextID;    /* Context ID of main status bar */
@@ -53,42 +40,43 @@ 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 */
  
   //  lttv_trace_filter * filter; /* trace filter associated with the window */
 
-  /* Traceset related information */
-  TracesetInfo * Traceset_Info; 
   /* Attributes for trace reading hooks local to the main window */
-  LttvIAttribute * Attributes;
+  LttvIAttribute * attributes;
   
-  tab * Tab;
-  tab * CurrentTab;
+  Tab * tab;
+  Tab * current_tab;
 
-  WindowCreationData * winCreationData; 
+  WindowCreationData * win_creation_data; 
 
   GHashTable * hash_menu_item;
   GHashTable * hash_toolbar_item;
 };
 
 
-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;
+  TimeWindow time_window;
   
   // The current time is the time selected in the visible area by the user,
   // not the scrollbar value.
-  LttTime currentTime;
-  LttvIAttribute * Attributes;
+  LttTime current_time;
+  LttvIAttribute * attributes;
+
+  struct _Tab * next;
+  MainWindow  * mw;
 
-  struct _tab * Next;
-  mainWindow  * mw;
+  /* Traceset related information */
+  TracesetInfo * traceset_info; 
 };
 
 /**