comment out not working items in the GUI

git-svn-id: http://ltt.polymtl.ca/svn@321 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/ltt/branches/poly/include/ltt/time.h b/ltt/branches/poly/include/ltt/time.h
index 4f8094330647ec3927c5040a8579a56cb0e23922..dc0f8ecb67186a0af560c5c2e8a5ae4b4839536f 100644 (file)
--- a/ltt/branches/poly/include/ltt/time.h
+++ b/ltt/branches/poly/include/ltt/time.h
@@ -43,13 +43,21 @@ static inline LttTime ltt_time_add(LttTime t1, LttTime t2)
 
 static inline LttTime ltt_time_mul(LttTime t1, float f)
 {
-  double nsec;
   LttTime res;
+  float d = 1.0/f;
+  double sec;
 
-  nsec = (double)t1.tv_nsec * f;
-  res.tv_sec = nsec / NANOSECONDS_PER_SECOND;
-  res.tv_nsec = nsec - res.tv_sec * NANOSECONDS_PER_SECOND;
-  res.tv_sec += t1.tv_sec * f;
+  if(f == 0.0){
+    res.tv_sec = 0;
+    res.tv_nsec = 0;
+  }else{
+    sec = t1.tv_sec / (double)d;
+    res.tv_sec = sec;
+    res.tv_nsec = t1.tv_nsec / (double)d + (sec - res.tv_sec) *
+                  NANOSECONDS_PER_SECOND;
+    res.tv_sec += res.tv_nsec / NANOSECONDS_PER_SECOND;
+    res.tv_nsec %= NANOSECONDS_PER_SECOND;
+  }
   return res;
 }
 
@@ -63,6 +71,8 @@ static inline LttTime ltt_time_div(LttTime t1, float f)
   res.tv_sec = sec;
   res.tv_nsec = t1.tv_nsec / (double)f + (sec - res.tv_sec) *
       NANOSECONDS_PER_SECOND;
+  res.tv_sec += res.tv_nsec / NANOSECONDS_PER_SECOND;
+  res.tv_nsec %= NANOSECONDS_PER_SECOND;
   return res;
 }
 

diff --git a/ltt/branches/poly/include/lttv/gtkcustom.h b/ltt/branches/poly/include/lttv/gtkcustom.h
index 016df1bd2da51c9789df59c6e1ab45494294d812..cb0817fdbece48d801c4c510449d0039d0105cfb 100644 (file)
--- a/ltt/branches/poly/include/lttv/gtkcustom.h
+++ b/ltt/branches/poly/include/lttv/gtkcustom.h
@@ -57,6 +57,7 @@ void gtk_custom_widget_add(GtkCustom * custom, GtkWidget * widget1);
 void gtk_custom_widget_delete(GtkCustom * custom);
 void gtk_custom_widget_move_up(GtkCustom * custom);
 void gtk_custom_widget_move_down(GtkCustom * custom);
+void gtk_custom_set_adjust(GtkCustom * custom, gboolean first_time);
 
 
 

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 cbac07a4e214fe80d3423f62bad41d9368ad02bf..ca532d25d57bb7f96570b6b21162b02b69d4ffbb 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c
+++ b/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c
@@ -285,19 +285,53 @@ void save_as(GtkWidget * widget, gpointer user_data)
   g_printf("Save as\n");
 }
 
+void zoom(GtkWidget * widget, double size)
+{
+  TimeInterval *time_span;
+  TimeWindow time_window;
+  LttTime    current_time, time_delta, time_s, time_e;
+  MainWindow * mw_data = get_window_data_struct(widget);
+
+  time_span = LTTV_TRACESET_CONTEXT(mw_data->traceset_info->traceset_context)->Time_Span ;
+  time_window =  mw_data->current_tab->time_window;
+  current_time = mw_data->current_tab->current_time;
+  
+  time_delta = ltt_time_sub(time_span->endTime,time_span->startTime);
+  if(size == 0){
+    time_window.start_time = time_span->startTime;
+    time_window.time_width = time_delta;
+  }else{
+    time_window.time_width = ltt_time_div(time_window.time_width, size);
+    if(ltt_time_compare(time_window.time_width,time_delta) > 0)
+      time_window.time_width = time_delta;        
+
+    time_s = ltt_time_sub(current_time,ltt_time_div(time_window.time_width, 2));
+    time_e = ltt_time_add(current_time,ltt_time_div(time_window.time_width, 2));
+    if(ltt_time_compare(time_span->startTime, time_s) > 0){
+      time_s = time_span->startTime;
+    }else if(ltt_time_compare(time_span->endTime, time_e) < 0){
+      time_e = time_span->endTime;
+      time_s = ltt_time_sub(time_e,time_window.time_width);
+    }
+    time_window.start_time = time_s;    
+  }
+  set_time_window(mw_data, &time_window);
+  gtk_custom_set_adjust(mw_data->current_tab->custom, FALSE);
+}
+
 void zoom_in(GtkWidget * widget, gpointer user_data)
 {
-  g_printf("Zoom in\n");
+  zoom(widget, 2);
 }
 
 void zoom_out(GtkWidget * widget, gpointer user_data)
 {
-  g_printf("Zoom out\n");
+  zoom(widget, 0.5);
 }
 
 void zoom_extended(GtkWidget * widget, gpointer user_data)
 {
-  g_printf("Zoom extended\n");
+  zoom(widget, 0);
 }
 
 void go_to_time(GtkWidget * widget, gpointer user_data)

diff --git a/ltt/branches/poly/lttv/modules/gui/mainWin/src/gtkcustom.c b/ltt/branches/poly/lttv/modules/gui/mainWin/src/gtkcustom.c
index cd914cd87b42059dc1a3d7c0236b5fce131155b1..492a9ef018067e9dd72929daa98041deb0c5dad6 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/mainWin/src/gtkcustom.c
+++ b/ltt/branches/poly/lttv/modules/gui/mainWin/src/gtkcustom.c
@@ -102,13 +102,41 @@ void gtk_custom_set_focus (GtkWidget * widget, gpointer user_data)
   }
 }
 
+void gtk_custom_set_adjust(GtkCustom * custom, gboolean first_time)
+{
+  TimeWindow time_window;
+  TimeInterval *time_span;
+
+  get_time_window(custom->mw,&time_window);
+  if(first_time){
+    time_span = LTTV_TRACESET_CONTEXT(custom->mw->traceset_info->traceset_context)->Time_Span ;
+  
+    custom->hadjust->lower = ltt_time_to_double(time_span->startTime) * 
+                             NANOSECONDS_PER_SECOND;
+    custom->hadjust->value = custom->hadjust->lower;
+    custom->hadjust->upper = ltt_time_to_double(time_span->endTime) *
+                             NANOSECONDS_PER_SECOND;
+  }
+
+  /* Page increment of whole visible area */
+  if(custom->hadjust == NULL){
+    g_warning("Insert a viewer first");
+    return;
+  }
+  custom->hadjust->page_increment = ltt_time_to_double(
+                       time_window.time_width) * NANOSECONDS_PER_SECOND;
+  /* page_size to the whole visible area will take care that the
+     * scroll value + the shown area will never be more than what is
+     * in the trace. */
+  custom->hadjust->page_size = custom->hadjust->page_increment;
+  custom->hadjust->step_increment = custom->hadjust->page_increment / 10;
+
+}
+
 void gtk_custom_widget_add(GtkCustom * custom, GtkWidget * widget1)
 {
   GtkPaned * tmpPane; 
   GtkWidget * w;
-  TimeWindow Time_Window;
-  LttTime      time;
-  TimeInterval *Time_Span;
   
   g_return_if_fail(GTK_IS_CUSTOM(custom));
   g_object_ref(G_OBJECT(widget1));
@@ -122,23 +150,7 @@ void gtk_custom_widget_add(GtkCustom * custom, GtkWidget * widget1)
     gtk_widget_show(custom->hscrollbar);
 
     custom->hadjust = gtk_range_get_adjustment(GTK_RANGE(custom->hscrollbar));
-    get_time_window(custom->mw,&Time_Window);
-    get_current_time(custom->mw,&time);
-    Time_Span = LTTV_TRACESET_CONTEXT(custom->mw->traceset_info->traceset_context)->Time_Span ;
-
-    custom->hadjust->lower =  ltt_time_to_double(Time_Span->startTime) * 
-        NANOSECONDS_PER_SECOND;
-    custom->hadjust->value = custom->hadjust->lower;
-    custom->hadjust->upper = ltt_time_to_double(Time_Span->endTime) *
-        NANOSECONDS_PER_SECOND;
-    /* Page increment of whole visible area */
-    custom->hadjust->page_increment = ltt_time_to_double(
-        Time_Window.time_width) * NANOSECONDS_PER_SECOND;
-    /* page_size to the whole visible area will take care that the
-     * scroll value + the shown area will never be more than what is
-     * in the trace. */
-    custom->hadjust->page_size = custom->hadjust->page_increment;
-    custom->hadjust->step_increment = custom->hadjust->page_increment / 10;
+    gtk_custom_set_adjust(custom, TRUE);
 
     gtk_range_set_update_policy (GTK_RANGE(custom->hscrollbar),
                                   GTK_UPDATE_DISCONTINUOUS);

diff --git a/ltt/branches/poly/lttv/modules/gui/mainWin/src/interface.c b/ltt/branches/poly/lttv/modules/gui/mainWin/src/interface.c
index af6eb8c51b62d906f52fa907732db2203749c69d..91944afe5f8a4c743aa70957827e7a157ced42ea 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/mainWin/src/interface.c
+++ b/ltt/branches/poly/lttv/modules/gui/mainWin/src/interface.c
@@ -41,30 +41,30 @@ create_MWindow (void)
   GtkWidget *CloneTraceset;
   GtkWidget *FileMenuNewSep;
   GtkWidget *Tab;
-  GtkWidget *OpenTraceset;
+  //  GtkWidget *OpenTraceset;
   GtkWidget *Close;
   GtkWidget *CloseTab;
   GtkWidget *FileMenuSeparator1;
   GtkWidget *AddTrace;
   GtkWidget *RemoveTrace;
-  GtkWidget *Save;
-  GtkWidget *SaveAs;
+  //  GtkWidget *Save;
+  //  GtkWidget *SaveAs;
   GtkWidget *FileMenuSeparator2;
   GtkWidget *Quit;
-  GtkWidget *EditMenuTitle;
-  GtkWidget *EditMenuTitle_menu;
-  GtkWidget *Cut;
-  GtkWidget *Copy;
-  GtkWidget *Paste;
-  GtkWidget *Delete;
+  //  GtkWidget *EditMenuTitle;
+  //  GtkWidget *EditMenuTitle_menu;
+  //  GtkWidget *Cut;
+  //  GtkWidget *Copy;
+  //  GtkWidget *Paste;
+  //  GtkWidget *Delete;
   GtkWidget *ViewMenuTitle;
   GtkWidget *ViewMenuTitle_menu;
   GtkWidget *ZoomIn;
   GtkWidget *ZoomOut;
   GtkWidget *ZoomExtended;
   GtkWidget *ViewMenuSeparator;
-  GtkWidget *GoToTime;
-  GtkWidget *ShowTimeFrame;
+  //  GtkWidget *GoToTime;
+  //  GtkWidget *ShowTimeFrame;
   GtkWidget *ToolMenuTitle;
   GtkWidget *ToolMenuTitle_menu;
   GtkWidget *MoveViewerUp;
@@ -77,12 +77,12 @@ create_MWindow (void)
   GtkWidget *LoadModule;
   GtkWidget *UnloadModule;
   GtkWidget *AddModuleSearchPath;
-  GtkWidget *OptionMenuTitle;
-  GtkWidget *OptionMenuTitle_menu;
-  GtkWidget *Color;
-  GtkWidget *OptMenuSeparator;
-  GtkWidget *OpenFilter;
-  GtkWidget *SaveConfiguration;
+  //  GtkWidget *OptionMenuTitle;
+  //  GtkWidget *OptionMenuTitle_menu;
+  //  GtkWidget *Color;
+  //  GtkWidget *OptMenuSeparator;
+  //  GtkWidget *OpenFilter;
+  //  GtkWidget *SaveConfiguration;
   GtkWidget *MenuHelp;
   GtkWidget *HelpMenuTitle;
   GtkWidget *HelpMenu;
@@ -92,16 +92,16 @@ create_MWindow (void)
   GtkWidget *MToolbar1;
   GtkWidget *tmp_toolbar_icon;
   GtkWidget *tlbEmptyTraceset;
-  GtkWidget *tlbOpenTraceset;
+  //  GtkWidget *tlbOpenTraceset;
   GtkWidget *tlbAddTrace;
   GtkWidget *tlbRemoveTrace;
-  GtkWidget *tlbSave;
-  GtkWidget *tlbSaveAs;
+  //  GtkWidget *tlbSave;
+  //  GtkWidget *tlbSaveAs;
   GtkWidget *tlbZoomIn;
   GtkWidget *tlbZoomOut;
   GtkWidget *tlbZoomExtended;
-  GtkWidget *tlbGoToTime;
-  GtkWidget *tlbShowTimeFrame;
+  //  GtkWidget *tlbGoToTime;
+  //  GtkWidget *tlbShowTimeFrame;
   GtkWidget *tlbMoveViewerUp;
   GtkWidget *tlbMoveViewerDown;
   GtkWidget *tlbRemoveViewer;
@@ -161,11 +161,11 @@ create_MWindow (void)
   Tab = gtk_menu_item_new_with_mnemonic ("Tab");
   gtk_widget_show (Tab);
   gtk_container_add (GTK_CONTAINER (FileMenuNewTitle_menu), Tab);
-
+/*
   OpenTraceset = gtk_menu_item_new_with_mnemonic ("Open");
   gtk_widget_show (OpenTraceset);
   gtk_container_add (GTK_CONTAINER (FileMenuTitle_menu), OpenTraceset);
-
+*/
   Close = gtk_menu_item_new_with_mnemonic ("Close");
   gtk_widget_show (Close);
   gtk_container_add (GTK_CONTAINER (FileMenuTitle_menu), Close);
@@ -186,7 +186,7 @@ create_MWindow (void)
   RemoveTrace = gtk_menu_item_new_with_mnemonic ("Remove Trace");
   gtk_widget_show (RemoveTrace);
   gtk_container_add (GTK_CONTAINER (FileMenuTitle_menu), RemoveTrace);
-
+/*
   Save = gtk_menu_item_new_with_mnemonic ("Save");
   gtk_widget_show (Save);
   gtk_container_add (GTK_CONTAINER (FileMenuTitle_menu), Save);
@@ -194,7 +194,7 @@ create_MWindow (void)
   SaveAs = gtk_menu_item_new_with_mnemonic ("Save As");
   gtk_widget_show (SaveAs);
   gtk_container_add (GTK_CONTAINER (FileMenuTitle_menu), SaveAs);
-
+*/
   FileMenuSeparator2 = gtk_menu_item_new ();
   gtk_widget_show (FileMenuSeparator2);
   gtk_container_add (GTK_CONTAINER (FileMenuTitle_menu), FileMenuSeparator2);
@@ -203,7 +203,7 @@ create_MWindow (void)
   Quit = gtk_menu_item_new_with_mnemonic ("Quit");
   gtk_widget_show (Quit);
   gtk_container_add (GTK_CONTAINER (FileMenuTitle_menu), Quit);
-
+/*
   EditMenuTitle = gtk_menu_item_new_with_mnemonic ("_Edit");
   gtk_widget_show (EditMenuTitle);
   gtk_container_add (GTK_CONTAINER (MenuMain), EditMenuTitle);
@@ -226,7 +226,7 @@ create_MWindow (void)
   Delete = gtk_image_menu_item_new_from_stock ("gtk-delete", accel_group);
   gtk_widget_show (Delete);
   gtk_container_add (GTK_CONTAINER (EditMenuTitle_menu), Delete);
-
+*/
   ViewMenuTitle = gtk_menu_item_new_with_mnemonic ("_View");
   gtk_widget_show (ViewMenuTitle);
   gtk_container_add (GTK_CONTAINER (MenuMain), ViewMenuTitle);
@@ -250,7 +250,7 @@ create_MWindow (void)
   gtk_widget_show (ViewMenuSeparator);
   gtk_container_add (GTK_CONTAINER (ViewMenuTitle_menu), ViewMenuSeparator);
   gtk_widget_set_sensitive (ViewMenuSeparator, FALSE);
-
+/*
   GoToTime = gtk_menu_item_new_with_mnemonic ("Go to time");
   gtk_widget_show (GoToTime);
   gtk_container_add (GTK_CONTAINER (ViewMenuTitle_menu), GoToTime);
@@ -258,7 +258,7 @@ create_MWindow (void)
   ShowTimeFrame = gtk_menu_item_new_with_mnemonic ("Show time frame");
   gtk_widget_show (ShowTimeFrame);
   gtk_container_add (GTK_CONTAINER (ViewMenuTitle_menu), ShowTimeFrame);
-
+*/
   ToolMenuTitle = gtk_menu_item_new_with_mnemonic ("Tools");
   gtk_widget_show (ToolMenuTitle);
   gtk_container_add (GTK_CONTAINER (MenuMain), ToolMenuTitle);
@@ -305,7 +305,7 @@ create_MWindow (void)
   AddModuleSearchPath = gtk_menu_item_new_with_mnemonic ("Add module search path");
   gtk_widget_show (AddModuleSearchPath);
   gtk_container_add (GTK_CONTAINER (PluginMenuTitle_menu), AddModuleSearchPath);
-
+/*
   OptionMenuTitle = gtk_menu_item_new_with_mnemonic ("Options");
   gtk_widget_show (OptionMenuTitle);
   gtk_container_add (GTK_CONTAINER (MenuMain), OptionMenuTitle);
@@ -329,7 +329,7 @@ create_MWindow (void)
   SaveConfiguration = gtk_menu_item_new_with_mnemonic ("Save configuration");
   gtk_widget_show (SaveConfiguration);
   gtk_container_add (GTK_CONTAINER (OptionMenuTitle_menu), SaveConfiguration);
-
+*/
   MenuHelp = gtk_menu_bar_new ();
   gtk_widget_show (MenuHelp);
   gtk_box_pack_end (GTK_BOX (MMenuBox), MenuHelp, FALSE, FALSE, 0);
@@ -369,7 +369,7 @@ create_MWindow (void)
   gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (MToolbar1)->children)->data))->label), TRUE);
   gtk_widget_show (tlbEmptyTraceset);
   gtk_container_set_border_width (GTK_CONTAINER (tlbEmptyTraceset), 1);
-
+/*
   tmp_toolbar_icon = create_pixmap (MWindow, "fileopen.png");
   tlbOpenTraceset = gtk_toolbar_append_element (GTK_TOOLBAR (MToolbar1),
                                 GTK_TOOLBAR_CHILD_BUTTON,
@@ -380,7 +380,7 @@ create_MWindow (void)
   gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (MToolbar1)->children)->data))->label), TRUE);
   gtk_widget_show (tlbOpenTraceset);
   gtk_container_set_border_width (GTK_CONTAINER (tlbOpenTraceset), 1);
-
+*/
   tmp_toolbar_icon = create_pixmap (MWindow, "edit_add_22.png");
   tlbAddTrace = gtk_toolbar_append_element (GTK_TOOLBAR (MToolbar1),
                                 GTK_TOOLBAR_CHILD_BUTTON,
@@ -402,7 +402,7 @@ create_MWindow (void)
   gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (MToolbar1)->children)->data))->label), TRUE);
   gtk_widget_show (tlbRemoveTrace);
   gtk_container_set_border_width (GTK_CONTAINER (tlbRemoveTrace), 1);
-
+/*
   tmp_toolbar_icon = create_pixmap (MWindow, "filesave.png");
   tlbSave = gtk_toolbar_append_element (GTK_TOOLBAR (MToolbar1),
                                 GTK_TOOLBAR_CHILD_BUTTON,
@@ -424,7 +424,7 @@ create_MWindow (void)
   gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (MToolbar1)->children)->data))->label), TRUE);
   gtk_widget_show (tlbSaveAs);
   gtk_container_set_border_width (GTK_CONTAINER (tlbSaveAs), 1);
-
+*/
   gtk_toolbar_append_space (GTK_TOOLBAR (MToolbar1));
 
   tmp_toolbar_icon = create_pixmap (MWindow, "stock_zoom_in_24.png");
@@ -459,7 +459,7 @@ create_MWindow (void)
   gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (MToolbar1)->children)->data))->label), TRUE);
   gtk_widget_show (tlbZoomExtended);
   gtk_container_set_border_width (GTK_CONTAINER (tlbZoomExtended), 1);
-
+/*
   tmp_toolbar_icon = create_pixmap (MWindow, "gtk-jump-to.png");
   tlbGoToTime = gtk_toolbar_append_element (GTK_TOOLBAR (MToolbar1),
                                 GTK_TOOLBAR_CHILD_BUTTON,
@@ -481,7 +481,7 @@ create_MWindow (void)
   gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (MToolbar1)->children)->data))->label), TRUE);
   gtk_widget_show (tlbShowTimeFrame);
   gtk_container_set_border_width (GTK_CONTAINER (tlbShowTimeFrame), 1);
-
+*/
   gtk_toolbar_append_space (GTK_TOOLBAR (MToolbar1));
 
   tmp_toolbar_icon = create_pixmap (MWindow, "1uparrow.png");
@@ -551,9 +551,11 @@ create_MWindow (void)
   g_signal_connect ((gpointer) Tab, "activate",
                     G_CALLBACK (on_tab_activate),
                     NULL);
+/*
   g_signal_connect ((gpointer) OpenTraceset, "activate",
                     G_CALLBACK (on_open_activate),
                     NULL);
+*/
   g_signal_connect ((gpointer) Close, "activate",
                     G_CALLBACK (on_close_activate),
                     NULL);
@@ -566,15 +568,18 @@ create_MWindow (void)
   g_signal_connect ((gpointer) RemoveTrace, "activate",
                     G_CALLBACK (on_remove_trace_activate),
                     NULL);
+/*
   g_signal_connect ((gpointer) Save, "activate",
                     G_CALLBACK (on_save_activate),
                     NULL);
   g_signal_connect ((gpointer) SaveAs, "activate",
                     G_CALLBACK (on_save_as_activate),
                     NULL);
+*/
   g_signal_connect ((gpointer) Quit, "activate",
                     G_CALLBACK (on_quit_activate),
                     NULL);
+/*
   g_signal_connect ((gpointer) Cut, "activate",
                     G_CALLBACK (on_cut_activate),
                     NULL);
@@ -587,6 +592,7 @@ create_MWindow (void)
   g_signal_connect ((gpointer) Delete, "activate",
                     G_CALLBACK (on_delete_activate),
                     NULL);
+*/
   g_signal_connect ((gpointer) ZoomIn, "activate",
                     G_CALLBACK (on_zoom_in_activate),
                     NULL);
@@ -596,12 +602,14 @@ create_MWindow (void)
   g_signal_connect ((gpointer) ZoomExtended, "activate",
                     G_CALLBACK (on_zoom_extended_activate),
                     NULL);
+/*
   g_signal_connect ((gpointer) GoToTime, "activate",
-                    G_CALLBACK (on_go_to_time_activate),
-                    NULL);
+                   G_CALLBACK (on_go_to_time_activate),
+                   NULL);
   g_signal_connect ((gpointer) ShowTimeFrame, "activate",
                     G_CALLBACK (on_show_time_frame_activate),
                     NULL);
+*/
   g_signal_connect ((gpointer) MoveViewerUp, "activate",
                     G_CALLBACK (on_move_viewer_up_activate),
                     NULL);
@@ -623,6 +631,7 @@ create_MWindow (void)
   g_signal_connect ((gpointer) AddModuleSearchPath, "activate",
                     G_CALLBACK (on_add_module_search_path_activate),
                     NULL);
+/*
   g_signal_connect ((gpointer) Color, "activate",
                     G_CALLBACK (on_color_activate),
                     NULL);
@@ -632,6 +641,7 @@ create_MWindow (void)
   g_signal_connect ((gpointer) SaveConfiguration, "activate",
                     G_CALLBACK (on_save_configuration_activate),
                     NULL);
+*/
   g_signal_connect ((gpointer) Content, "activate",
                     G_CALLBACK (on_content_activate),
                     NULL);
@@ -641,21 +651,25 @@ create_MWindow (void)
   g_signal_connect ((gpointer) tlbEmptyTraceset, "clicked",
                     G_CALLBACK (on_button_new_clicked),
                     NULL);
+/*
   g_signal_connect ((gpointer) tlbOpenTraceset, "clicked",
                     G_CALLBACK (on_button_open_clicked),
                     NULL);
+*/
   g_signal_connect ((gpointer) tlbAddTrace, "clicked",
                     G_CALLBACK (on_button_add_trace_clicked),
                     NULL);
   g_signal_connect ((gpointer) tlbRemoveTrace, "clicked",
                     G_CALLBACK (on_button_remove_trace_clicked),
                     NULL);
+/*
   g_signal_connect ((gpointer) tlbSave, "clicked",
                     G_CALLBACK (on_button_save_clicked),
                     NULL);
   g_signal_connect ((gpointer) tlbSaveAs, "clicked",
                     G_CALLBACK (on_button_save_as_clicked),
                     NULL);
+*/
   g_signal_connect ((gpointer) tlbZoomIn, "clicked",
                     G_CALLBACK (on_button_zoom_in_clicked),
                     NULL);
@@ -665,12 +679,14 @@ create_MWindow (void)
   g_signal_connect ((gpointer) tlbZoomExtended, "clicked",
                     G_CALLBACK (on_button_zoom_extended_clicked),
                     NULL);
+/*
   g_signal_connect ((gpointer) tlbGoToTime, "clicked",
                     G_CALLBACK (on_button_go_to_time_clicked),
                     NULL);
   g_signal_connect ((gpointer) tlbShowTimeFrame, "clicked",
                     G_CALLBACK (on_button_show_time_frame_clicked),
                     NULL);
+*/
   g_signal_connect ((gpointer) tlbMoveViewerUp, "clicked",
                     G_CALLBACK (on_button_move_up_clicked),
                     NULL);
@@ -697,30 +713,30 @@ create_MWindow (void)
   GLADE_HOOKUP_OBJECT (MWindow, CloneTraceset, "CloneTraceset");
   GLADE_HOOKUP_OBJECT (MWindow, FileMenuNewSep, "FileMenuNewSep");
   GLADE_HOOKUP_OBJECT (MWindow, Tab, "Tab");
-  GLADE_HOOKUP_OBJECT (MWindow, OpenTraceset, "OpenTraceset");
+  //  GLADE_HOOKUP_OBJECT (MWindow, OpenTraceset, "OpenTraceset");
   GLADE_HOOKUP_OBJECT (MWindow, Close, "Close");
   GLADE_HOOKUP_OBJECT (MWindow, CloseTab, "CloseTab");
   GLADE_HOOKUP_OBJECT (MWindow, FileMenuSeparator1, "FileMenuSeparator1");
   GLADE_HOOKUP_OBJECT (MWindow, AddTrace, "AddTrace");
   GLADE_HOOKUP_OBJECT (MWindow, RemoveTrace, "RemoveTrace");
-  GLADE_HOOKUP_OBJECT (MWindow, Save, "Save");
-  GLADE_HOOKUP_OBJECT (MWindow, SaveAs, "SaveAs");
+  //  GLADE_HOOKUP_OBJECT (MWindow, Save, "Save");
+  //  GLADE_HOOKUP_OBJECT (MWindow, SaveAs, "SaveAs");
   GLADE_HOOKUP_OBJECT (MWindow, FileMenuSeparator2, "FileMenuSeparator2");
   GLADE_HOOKUP_OBJECT (MWindow, Quit, "Quit");
-  GLADE_HOOKUP_OBJECT (MWindow, EditMenuTitle, "EditMenuTitle");
-  GLADE_HOOKUP_OBJECT (MWindow, EditMenuTitle_menu, "EditMenuTitle_menu");
-  GLADE_HOOKUP_OBJECT (MWindow, Cut, "Cut");
-  GLADE_HOOKUP_OBJECT (MWindow, Copy, "Copy");
-  GLADE_HOOKUP_OBJECT (MWindow, Paste, "Paste");
-  GLADE_HOOKUP_OBJECT (MWindow, Delete, "Delete");
+  //  GLADE_HOOKUP_OBJECT (MWindow, EditMenuTitle, "EditMenuTitle");
+  //  GLADE_HOOKUP_OBJECT (MWindow, EditMenuTitle_menu, "EditMenuTitle_menu");
+  //  GLADE_HOOKUP_OBJECT (MWindow, Cut, "Cut");
+  //  GLADE_HOOKUP_OBJECT (MWindow, Copy, "Copy");
+  //  GLADE_HOOKUP_OBJECT (MWindow, Paste, "Paste");
+  //  GLADE_HOOKUP_OBJECT (MWindow, Delete, "Delete");
   GLADE_HOOKUP_OBJECT (MWindow, ViewMenuTitle, "ViewMenuTitle");
   GLADE_HOOKUP_OBJECT (MWindow, ViewMenuTitle_menu, "ViewMenuTitle_menu");
   GLADE_HOOKUP_OBJECT (MWindow, ZoomIn, "ZoomIn");
   GLADE_HOOKUP_OBJECT (MWindow, ZoomOut, "ZoomOut");
   GLADE_HOOKUP_OBJECT (MWindow, ZoomExtended, "ZoomExtended");
   GLADE_HOOKUP_OBJECT (MWindow, ViewMenuSeparator, "ViewMenuSeparator");
-  GLADE_HOOKUP_OBJECT (MWindow, GoToTime, "GoToTime");
-  GLADE_HOOKUP_OBJECT (MWindow, ShowTimeFrame, "ShowTimeFrame");
+  //  GLADE_HOOKUP_OBJECT (MWindow, GoToTime, "GoToTime");
+  //  GLADE_HOOKUP_OBJECT (MWindow, ShowTimeFrame, "ShowTimeFrame");
   GLADE_HOOKUP_OBJECT (MWindow, ToolMenuTitle, "ToolMenuTitle");
   GLADE_HOOKUP_OBJECT (MWindow, ToolMenuTitle_menu, "ToolMenuTitle_menu");
   GLADE_HOOKUP_OBJECT (MWindow, MoveViewerUp, "MoveViewerUp");
@@ -733,12 +749,12 @@ create_MWindow (void)
   GLADE_HOOKUP_OBJECT (MWindow, LoadModule, "LoadModule");
   GLADE_HOOKUP_OBJECT (MWindow, UnloadModule, "UnloadModule");
   GLADE_HOOKUP_OBJECT (MWindow, AddModuleSearchPath, "AddModuleSearchPath");
-  GLADE_HOOKUP_OBJECT (MWindow, OptionMenuTitle, "OptionMenuTitle");
-  GLADE_HOOKUP_OBJECT (MWindow, OptionMenuTitle_menu, "OptionMenuTitle_menu");
-  GLADE_HOOKUP_OBJECT (MWindow, Color, "Color");
-  GLADE_HOOKUP_OBJECT (MWindow, OptMenuSeparator, "OptMenuSeparator");
-  GLADE_HOOKUP_OBJECT (MWindow, OpenFilter, "OpenFilter");
-  GLADE_HOOKUP_OBJECT (MWindow, SaveConfiguration, "SaveConfiguration");
+  //  GLADE_HOOKUP_OBJECT (MWindow, OptionMenuTitle, "OptionMenuTitle");
+  //  GLADE_HOOKUP_OBJECT (MWindow, OptionMenuTitle_menu, "OptionMenuTitle_menu");
+  //  GLADE_HOOKUP_OBJECT (MWindow, Color, "Color");
+  //  GLADE_HOOKUP_OBJECT (MWindow, OptMenuSeparator, "OptMenuSeparator");
+  //  GLADE_HOOKUP_OBJECT (MWindow, OpenFilter, "OpenFilter");
+  //  GLADE_HOOKUP_OBJECT (MWindow, SaveConfiguration, "SaveConfiguration");
   GLADE_HOOKUP_OBJECT (MWindow, MenuHelp, "MenuHelp");
   GLADE_HOOKUP_OBJECT (MWindow, HelpMenuTitle, "HelpMenuTitle");
   GLADE_HOOKUP_OBJECT (MWindow, HelpMenu, "HelpMenu");
@@ -747,16 +763,16 @@ create_MWindow (void)
   GLADE_HOOKUP_OBJECT (MWindow, About, "About");
   GLADE_HOOKUP_OBJECT (MWindow, MToolbar1, "MToolbar1");
   GLADE_HOOKUP_OBJECT (MWindow, tlbEmptyTraceset, "tlbEmptyTraceset");
-  GLADE_HOOKUP_OBJECT (MWindow, tlbOpenTraceset, "tlbOpenTraceset");
+  //  GLADE_HOOKUP_OBJECT (MWindow, tlbOpenTraceset, "tlbOpenTraceset");
   GLADE_HOOKUP_OBJECT (MWindow, tlbAddTrace, "tlbAddTrace");
   GLADE_HOOKUP_OBJECT (MWindow, tlbRemoveTrace, "tlbRemoveTrace");
-  GLADE_HOOKUP_OBJECT (MWindow, tlbSave, "tlbSave");
-  GLADE_HOOKUP_OBJECT (MWindow, tlbSaveAs, "tlbSaveAs");
+  //  GLADE_HOOKUP_OBJECT (MWindow, tlbSave, "tlbSave");
+  //  GLADE_HOOKUP_OBJECT (MWindow, tlbSaveAs, "tlbSaveAs");
   GLADE_HOOKUP_OBJECT (MWindow, tlbZoomIn, "tlbZoomIn");
   GLADE_HOOKUP_OBJECT (MWindow, tlbZoomOut, "tlbZoomOut");
   GLADE_HOOKUP_OBJECT (MWindow, tlbZoomExtended, "tlbZoomExtended");
-  GLADE_HOOKUP_OBJECT (MWindow, tlbGoToTime, "tlbGoToTime");
-  GLADE_HOOKUP_OBJECT (MWindow, tlbShowTimeFrame, "tlbShowTimeFrame");
+  //  GLADE_HOOKUP_OBJECT (MWindow, tlbGoToTime, "tlbGoToTime");
+  // GLADE_HOOKUP_OBJECT (MWindow, tlbShowTimeFrame, "tlbShowTimeFrame");
   GLADE_HOOKUP_OBJECT (MWindow, tlbMoveViewerUp, "tlbMoveViewerUp");
   GLADE_HOOKUP_OBJECT (MWindow, tlbMoveViewerDown, "tlbMoveViewerDown");
   GLADE_HOOKUP_OBJECT (MWindow, tlbRemoveViewer, "tlbRemoveViewer");