X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fmain%2Fsrc%2Finterface.c;h=9c2e3f5fc4014d69926bf211b40a6284e7b4a477;hb=efde9138bd61f0ce9cabb3f2dcc0d0040eaf35ed;hp=5de418a5f05cef8095cd2097b788c88ae69e715c;hpb=e076699e6578637959dd0a6b175a8fa5d18dce38;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/main/src/interface.c b/ltt/branches/poly/lttv/modules/gui/main/src/interface.c
index 5de418a5..9c2e3f5f 100644
--- a/ltt/branches/poly/lttv/modules/gui/main/src/interface.c
+++ b/ltt/branches/poly/lttv/modules/gui/main/src/interface.c
@@ -113,6 +113,7 @@ create_MWindow (void)
   GtkWidget *MToolbar1;
   GtkWidget *tmp_toolbar_icon;
   GtkWidget *tlbEmptyTraceset;
+  GtkWidget *tlbTab;
   //  GtkWidget *tlbOpenTraceset;
   GtkWidget *tlbAddTrace;
   GtkWidget *tlbRemoveTrace;
@@ -137,7 +138,7 @@ create_MWindow (void)
 
   MWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_widget_set_size_request (MWindow, 100, 50);
-  gtk_window_set_title (GTK_WINDOW (MWindow), "Main window");
+  gtk_window_set_title (GTK_WINDOW (MWindow), "LTT");
   gtk_window_set_default_size (GTK_WINDOW (MWindow), 600, 400);
 
   MVbox = gtk_vbox_new (FALSE, 0);
@@ -405,6 +406,18 @@ 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, "filenew.png");
+  tlbTab = gtk_toolbar_append_element (GTK_TOOLBAR (MToolbar1),
+                                GTK_TOOLBAR_CHILD_BUTTON,
+                                NULL,
+                                "",
+                                "New tab", NULL,
+                                tmp_toolbar_icon, NULL, NULL);
+  gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (MToolbar1)->children)->data))->label), TRUE);
+  gtk_widget_show (tlbTab);
+  gtk_container_set_border_width (GTK_CONTAINER (tlbTab), 1);
+
 /*
   tmp_toolbar_icon = create_pixmap (MWindow, "fileopen.png");
   tlbOpenTraceset = gtk_toolbar_append_element (GTK_TOOLBAR (MToolbar1),
@@ -553,13 +566,16 @@ create_MWindow (void)
   gtk_widget_show (tlbRemoveViewer);
   gtk_container_set_border_width (GTK_CONTAINER (tlbRemoveViewer), 1);
 
-  MToolbar2 = gtk_toolbar_new ();
-  gtk_widget_show (MToolbar2);
-  gtk_box_pack_start (GTK_BOX (MVbox), MToolbar2, FALSE, FALSE, 0);
-  gtk_toolbar_set_style (GTK_TOOLBAR (MToolbar2), GTK_TOOLBAR_ICONS);
+  gtk_toolbar_append_space (GTK_TOOLBAR (MToolbar1));
+
+  //  MToolbar2 = gtk_toolbar_new ();
+  //  gtk_widget_show (MToolbar2);
+  //  gtk_box_pack_start (GTK_BOX (MVbox), MToolbar2, FALSE, FALSE, 0);
+  //  gtk_toolbar_set_style (GTK_TOOLBAR (MToolbar2), GTK_TOOLBAR_ICONS);
 
   MNotebook = gtk_notebook_new ();
   gtk_widget_show (MNotebook);
+  gtk_notebook_set_show_tabs((GtkNotebook*)MNotebook, FALSE);
   gtk_box_pack_start (GTK_BOX (MVbox), MNotebook, TRUE, TRUE, 0);
 /*
   empty_notebook_page = gtk_vbox_new (FALSE, 0);
@@ -696,6 +712,9 @@ create_MWindow (void)
   g_signal_connect ((gpointer) tlbEmptyTraceset, "clicked",
                     G_CALLBACK (on_button_new_clicked),
                     NULL);
+  g_signal_connect ((gpointer) tlbTab, "clicked",
+                    G_CALLBACK (on_button_new_tab_clicked),
+                    NULL);
 /*
   g_signal_connect ((gpointer) tlbOpenTraceset, "clicked",
                     G_CALLBACK (on_button_open_clicked),
@@ -811,6 +830,7 @@ 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, tlbTab, "tlbTab");
   //  GLADE_HOOKUP_OBJECT (MWindow, tlbOpenTraceset, "tlbOpenTraceset");
   GLADE_HOOKUP_OBJECT (MWindow, tlbAddTrace, "tlbAddTrace");
   GLADE_HOOKUP_OBJECT (MWindow, tlbRemoveTrace, "tlbRemoveTrace");