removed many g_error and exit(1) from the tracefile reader

[lttv.git] / ltt / branches / poly / lttv / modules / gui / lttvwindow / lttvwindow / callbacks.c

diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
index 1e678444220e43f70e57d51104d68a15041a4868..3b0aad1c1b6a2e3cf8d08086cab68ca3e513ea0b 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
@@ -1072,13 +1072,17 @@ void add_trace(GtkWidget * widget, gpointer user_data)
       trace_v = lttvwindowtraces_get_trace_by_name(abs_path);
       if(trace_v == NULL) {
         trace = ltt_trace_open(abs_path);
-        if(trace == NULL) g_critical("cannot open trace %s", abs_path);
-        trace_v = lttv_trace_new(trace);
-        lttvwindowtraces_add_trace(trace_v);
+        if(trace == NULL) {
+          g_warning("cannot open trace %s", abs_path);
+        } else {
+          trace_v = lttv_trace_new(trace);
+          lttvwindowtraces_add_trace(trace_v);
+          lttvwindow_add_trace(tab, trace_v);
+        }
+      } else {
+        lttvwindow_add_trace(tab, trace_v);
       }
 
-      lttvwindow_add_trace(tab, trace_v);
-
       gtk_widget_destroy((GtkWidget*)file_selector);
       
       //update current tab
@@ -1406,7 +1410,6 @@ void zoom(GtkWidget * widget, double size)
     else
     {
       /* Center the image on the current time */
-      g_critical("update is HERE");
       new_time_window.start_time = 
         ltt_time_sub(current_time, ltt_time_div(new_time_window.time_width, 2.0));
       /* If on borders, don't fall off */
@@ -1554,14 +1557,14 @@ on_close_activate                      (GtkMenuItem     *menuitem,
  */
 
 void
-on_close_tab_activate                  (GtkMenuItem     *menuitem,
+on_close_tab_activate                  (GtkWidget       *widget,
                                         gpointer         user_data)
 {
   gint page_num;
   GtkWidget * notebook;
   GtkWidget * page;
-  MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
-  notebook = lookup_widget((GtkWidget*)menuitem, "MNotebook");
+  MainWindow * mw_data = get_window_data_struct(widget);
+  notebook = lookup_widget(widget, "MNotebook");
   if(notebook == NULL){
     g_printf("Notebook does not exist\n");
     return;
@@ -1573,6 +1576,22 @@ on_close_tab_activate                  (GtkMenuItem     *menuitem,
 
 }
 
+void
+on_close_tab_X_clicked                 (GtkWidget       *widget,
+                                        gpointer         user_data)
+{
+  gint page_num;
+  GtkWidget *notebook = lookup_widget(widget, "MNotebook");
+  if(notebook == NULL){
+    g_printf("Notebook does not exist\n");
+    return;
+  }
+ 
+  if((page_num = gtk_notebook_page_num(GTK_NOTEBOOK(notebook), widget)) != -1)
+    gtk_notebook_remove_page(GTK_NOTEBOOK(notebook), page_num);
+
+}
+
 
 void
 on_add_trace_activate                  (GtkMenuItem     *menuitem,
@@ -2600,6 +2619,7 @@ void construct_main_window(MainWindow * parent)
     g_printf("Notebook does not exist\n");
     return;
   }
+  gtk_notebook_popup_enable (GTK_NOTEBOOK(notebook));
   //for now there is no name field in LttvTraceset structure
   //Use "Traceset" as the label for the default tab
   if(parent) {
@@ -2743,10 +2763,41 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab,
   tab->multi_vpaned = (GtkMultiVPaned*)gtk_multi_vpaned_new();
   gtk_widget_show((GtkWidget*)tab->multi_vpaned);
   tab->mw   = mw;
+  
+  /*{
+    // Display a label with a X
+    GtkWidget *w_hbox = gtk_hbox_new(FALSE, 4);
+    GtkWidget *w_label = gtk_label_new (label);
+    GtkWidget *pixmap = create_pixmap(GTK_WIDGET(notebook), "close.png");
+    GtkWidget *w_button = gtk_button_new ();
+    gtk_container_add(GTK_CONTAINER(w_button), pixmap);
+    //GtkWidget *w_button = gtk_button_new_with_label("x");
+
+    gtk_button_set_relief(GTK_BUTTON(w_button), GTK_RELIEF_NONE);
+    
+    gtk_box_pack_start(GTK_BOX(w_hbox), w_label, TRUE, TRUE, 0);
+    gtk_box_pack_end(GTK_BOX(w_hbox), w_button, FALSE,
+                       FALSE, 0);
+
+    g_signal_connect_swapped (w_button, "clicked",
+                      G_CALLBACK (on_close_tab_X_clicked),
+                      tab->multi_vpaned);
+
+    gtk_widget_set_state(w_button, GTK_STATE_ACTIVE);
+
+    gtk_widget_show (w_label);
+    gtk_widget_show (pixmap);
+    gtk_widget_show (w_button);
+    gtk_widget_show (w_hbox);
+
+    tab->label = w_hbox;
+  }*/
+
 
   tab->label = gtk_label_new (label);
   gtk_widget_show (tab->label);
 
+
   /* Start with empty events requests list */
   tab->events_requests = NULL;
   tab->events_request_pending = FALSE;