X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Finterface.c;h=56013356c8ac111b78d149cbad9fe290112598f2;hb=e40cdd19296a4fbacf0738fb3671f6d0503d9e99;hp=ac825c342ba1a4b3a50db7fba209dff5c2d89827;hpb=22f1e406f50c775d048da90a3800c3ab623db729;p=lttv.git diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/interface.c b/lttv/modules/gui/lttvwindow/lttvwindow/interface.c index ac825c34..56013356 100644 --- a/lttv/modules/gui/lttvwindow/lttvwindow/interface.c +++ b/lttv/modules/gui/lttvwindow/lttvwindow/interface.c @@ -106,7 +106,6 @@ create_MWindow (void) // GtkWidget *OptMenuSeparator; // GtkWidget *OpenFilter; // GtkWidget *SaveConfiguration; - GtkWidget *MenuHelp; GtkWidget *HelpMenuTitle; GtkWidget *HelpMenu; GtkWidget *Content; @@ -143,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); @@ -177,15 +182,17 @@ create_MWindow (void) // gtk_container_add (GTK_CONTAINER (FileMenuNewTitle_menu), EmptyTraceset); // CloneTraceset = gtk_menu_item_new_with_mnemonic ("Clone trace set"); +#ifdef BABEL_CLEANUP CloneTraceset = gtk_menu_item_new_with_mnemonic ("New window"); gtk_widget_show (CloneTraceset); gtk_container_add (GTK_CONTAINER (FileMenuNewTitle_menu), CloneTraceset); + FileMenuNewSep = gtk_menu_item_new (); gtk_widget_show (FileMenuNewSep); gtk_container_add (GTK_CONTAINER (FileMenuNewTitle_menu), FileMenuNewSep); gtk_widget_set_sensitive (FileMenuNewSep, FALSE); - +#endif Tab = gtk_menu_item_new_with_mnemonic ("Tab"); gtk_widget_show (Tab); gtk_container_add (GTK_CONTAINER (FileMenuNewTitle_menu), Tab); @@ -379,13 +386,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); @@ -408,6 +412,7 @@ create_MWindow (void) gtk_box_pack_start (GTK_BOX (MVbox), MToolbar1, FALSE, FALSE, 0); gtk_toolbar_set_style (GTK_TOOLBAR (MToolbar1), GTK_TOOLBAR_ICONS); +#ifdef BABEL_CLEANUP tmp_toolbar_icon = create_pixmap (MWindow, "filenew.png"); tlbEmptyTraceset = gtk_toolbar_append_element (GTK_TOOLBAR (MToolbar1), GTK_TOOLBAR_CHILD_BUTTON, @@ -419,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 (tlbEmptyTraceset); gtk_container_set_border_width (GTK_CONTAINER (tlbEmptyTraceset), 1); - +#endif tmp_toolbar_icon = create_pixmap (MWindow, "filenew.png"); tlbTab = gtk_toolbar_append_element (GTK_TOOLBAR (MToolbar1), GTK_TOOLBAR_CHILD_BUTTON, @@ -655,9 +660,11 @@ create_MWindow (void) // g_signal_connect ((gpointer) EmptyTraceset, "activate", // G_CALLBACK (on_empty_traceset_activate), // NULL); +#ifdef BABEL_CLEANUP g_signal_connect ((gpointer) CloneTraceset, "activate", G_CALLBACK (on_clone_traceset_activate), NULL); +#endif g_signal_connect ((gpointer) Tab, "activate", G_CALLBACK (on_tab_activate), NULL); @@ -773,9 +780,11 @@ create_MWindow (void) g_signal_connect ((gpointer) About, "activate", G_CALLBACK (on_about_activate), NULL); +#ifdef BABEL_CLEANUP g_signal_connect ((gpointer) tlbEmptyTraceset, "clicked", G_CALLBACK (on_button_new_clicked), NULL); +#endif g_signal_connect ((gpointer) tlbTab, "clicked", G_CALLBACK (on_button_new_tab_clicked), NULL); @@ -847,8 +856,10 @@ create_MWindow (void) GLADE_HOOKUP_OBJECT (MWindow, FileMenuNewTitle, "FileMenuNewTitle"); GLADE_HOOKUP_OBJECT (MWindow, FileMenuNewTitle_menu, "FileMenuNewTitle_menu"); // GLADE_HOOKUP_OBJECT (MWindow, EmptyTraceset, "EmptyTraceset"); +#ifdef BABEL_CLEANUP GLADE_HOOKUP_OBJECT (MWindow, CloneTraceset, "CloneTraceset"); GLADE_HOOKUP_OBJECT (MWindow, FileMenuNewSep, "FileMenuNewSep"); +#endif GLADE_HOOKUP_OBJECT (MWindow, Tab, "Tab"); // GLADE_HOOKUP_OBJECT (MWindow, OpenTraceset, "OpenTraceset"); GLADE_HOOKUP_OBJECT (MWindow, Close, "Close"); @@ -897,14 +908,15 @@ 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"); GLADE_HOOKUP_OBJECT (MWindow, HelpmenuSeparator, "HelpmenuSeparator"); GLADE_HOOKUP_OBJECT (MWindow, About, "About"); GLADE_HOOKUP_OBJECT (MWindow, MToolbar1, "MToolbar1"); +#ifdef BABEL_CLEANUP GLADE_HOOKUP_OBJECT (MWindow, tlbEmptyTraceset, "tlbEmptyTraceset"); +#endif BABEL_CLEANUP GLADE_HOOKUP_OBJECT (MWindow, tlbTab, "tlbTab"); // GLADE_HOOKUP_OBJECT (MWindow, tlbOpenTraceset, "tlbOpenTraceset"); GLADE_HOOKUP_OBJECT (MWindow, tlbAddTrace, "tlbAddTrace");