Initial port of the detailed event view

[lttv.git] / lttv / modules / gui / lttvwindow / lttvwindow / interface.c

diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/interface.c b/lttv/modules/gui/lttvwindow/lttvwindow/interface.c
index 6d87df277510303be8a8e4938cdeadb0f9c4ff51..9e55661fa2a47fe8d3b64639888d111bdec817dd 100644 (file)
--- a/lttv/modules/gui/lttvwindow/lttvwindow/interface.c
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/interface.c
@@ -80,7 +80,6 @@ create_MWindow (void)
   GtkWidget *ZoomIn;
   GtkWidget *ZoomOut;
   GtkWidget *ZoomExtended;
-  GtkWidget *ViewMenuSeparator;
   //  GtkWidget *GoToTime;
   //  GtkWidget *ShowTimeFrame;
   GtkWidget *ToolMenuTitle;
@@ -107,7 +106,6 @@ create_MWindow (void)
   //  GtkWidget *OptMenuSeparator;
   //  GtkWidget *OpenFilter;
   //  GtkWidget *SaveConfiguration;
-  GtkWidget *MenuHelp;
   GtkWidget *HelpMenuTitle;
   GtkWidget *HelpMenu;
   GtkWidget *Content;
@@ -144,9 +142,15 @@ 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), "Linux Trace Toolkit Viewer");
+  
+  /* making the window a size higher than 80% of the screen cause a gtk glitch 
+   * where the window is automaticly going fullscreen but the widgets stay 
+   * the normal size.
+   */
   gtk_window_set_default_size (GTK_WINDOW (MWindow),
-      gdk_screen_width()*0.9, gdk_screen_height()*0.9);
-
+                       gdk_screen_width()*0.8, gdk_screen_height()*0.8);
+  gtk_window_set_icon(GTK_WINDOW(MWindow), create_pixbuf("lttng_logo.svg"));
+  
   MVbox = gtk_vbox_new (FALSE, 0);
   gtk_widget_show (MVbox);
   gtk_container_add (GTK_CONTAINER (MWindow), MVbox);
@@ -275,10 +279,6 @@ create_MWindow (void)
   gtk_widget_show (ZoomExtended);
   gtk_container_add (GTK_CONTAINER (ViewMenuTitle_menu), ZoomExtended);
 
-  ViewMenuSeparator = gtk_menu_item_new ();
-  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);
@@ -384,13 +384,10 @@ create_MWindow (void)
   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);
 
   HelpMenuTitle = gtk_menu_item_new_with_mnemonic ("_Help");
   gtk_widget_show (HelpMenuTitle);
-  gtk_container_add (GTK_CONTAINER (MenuHelp), HelpMenuTitle);
+  gtk_container_add (GTK_CONTAINER (MenuMain), HelpMenuTitle);
 
   HelpMenu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (HelpMenuTitle), HelpMenu);
@@ -876,7 +873,6 @@ create_MWindow (void)
   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, ToolMenuTitle, "ToolMenuTitle");
@@ -903,7 +899,6 @@ create_MWindow (void)
   //  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");
   GLADE_HOOKUP_OBJECT (MWindow, Content, "Content");