X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Finterface.c;h=007b33e6f632df5aeecf7b22f2349a3ae1805b08;hb=ec7a5af61127aa50a1839eee5be99ce53494c57b;hp=ee08b8e946c4869573a68090f5b7caf4de8db72c;hpb=754351700b3d5fb6112e72dd4722a546abc219f1;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/interface.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/interface.c index ee08b8e9..007b33e6 100644 --- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/interface.c +++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/interface.c @@ -95,9 +95,12 @@ create_MWindow (void) // GtkWidget *insert_viewer_test; GtkWidget *PluginMenuTitle; GtkWidget *PluginMenuTitle_menu; + GtkWidget *LoadLibrary; + GtkWidget *UnloadLibrary; GtkWidget *LoadModule; GtkWidget *UnloadModule; - GtkWidget *AddModuleSearchPath; + GtkWidget *AddLibrarySearchPath; + GtkWidget *RemoveLibrarySearchPath; // GtkWidget *OptionMenuTitle; // GtkWidget *OptionMenuTitle_menu; // GtkWidget *Color; @@ -117,13 +120,16 @@ create_MWindow (void) // GtkWidget *tlbOpenTraceset; GtkWidget *tlbAddTrace; GtkWidget *tlbRemoveTrace; + GtkWidget *tlbRedraw; + GtkWidget *tlbContinueProcessing; + GtkWidget *tlbStopProcessing; // GtkWidget *tlbSave; // GtkWidget *tlbSaveAs; GtkWidget *tlbZoomIn; GtkWidget *tlbZoomOut; GtkWidget *tlbZoomExtended; - // GtkWidget *tlbGoToTime; - // GtkWidget *tlbShowTimeFrame; + //GtkWidget *tlbGoToTime; + //GtkWidget *tlbShowTimeFrame; GtkWidget *tlbMoveViewerUp; GtkWidget *tlbMoveViewerDown; GtkWidget *tlbRemoveViewer; @@ -138,8 +144,9 @@ 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), "LTT"); - gtk_window_set_default_size (GTK_WINDOW (MWindow), 600, 400); + gtk_window_set_title (GTK_WINDOW (MWindow), "Linux Trace Toolkit Viewer"); + gtk_window_set_default_size (GTK_WINDOW (MWindow), + gdk_screen_width()*0.9, gdk_screen_height()*0.9); MVbox = gtk_vbox_new (FALSE, 0); gtk_widget_show (MVbox); @@ -330,6 +337,14 @@ create_MWindow (void) PluginMenuTitle_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (PluginMenuTitle), PluginMenuTitle_menu); + LoadLibrary = gtk_menu_item_new_with_mnemonic ("Load library"); + gtk_widget_show (LoadLibrary); + gtk_container_add (GTK_CONTAINER (PluginMenuTitle_menu), LoadLibrary); + + UnloadLibrary = gtk_menu_item_new_with_mnemonic ("Unload library"); + gtk_widget_show (UnloadLibrary); + gtk_container_add (GTK_CONTAINER (PluginMenuTitle_menu), UnloadLibrary); + LoadModule = gtk_menu_item_new_with_mnemonic ("Load module"); gtk_widget_show (LoadModule); gtk_container_add (GTK_CONTAINER (PluginMenuTitle_menu), LoadModule); @@ -338,9 +353,13 @@ create_MWindow (void) gtk_widget_show (UnloadModule); gtk_container_add (GTK_CONTAINER (PluginMenuTitle_menu), UnloadModule); - AddModuleSearchPath = gtk_menu_item_new_with_mnemonic ("Add module search path"); - gtk_widget_show (AddModuleSearchPath); - gtk_container_add (GTK_CONTAINER (PluginMenuTitle_menu), AddModuleSearchPath); + AddLibrarySearchPath = gtk_menu_item_new_with_mnemonic ("Add library search path"); + gtk_widget_show (AddLibrarySearchPath); + gtk_container_add (GTK_CONTAINER (PluginMenuTitle_menu), AddLibrarySearchPath); + + RemoveLibrarySearchPath = gtk_menu_item_new_with_mnemonic ("Remove library search path"); + gtk_widget_show (RemoveLibrarySearchPath); + gtk_container_add (GTK_CONTAINER (PluginMenuTitle_menu), RemoveLibrarySearchPath); /* OptionMenuTitle = gtk_menu_item_new_with_mnemonic ("Options"); gtk_widget_show (OptionMenuTitle); @@ -474,6 +493,45 @@ create_MWindow (void) gtk_widget_show (tlbSaveAs); gtk_container_set_border_width (GTK_CONTAINER (tlbSaveAs), 1); */ + gtk_toolbar_append_space (GTK_TOOLBAR (MToolbar1)); + + /* Manually added by Mathieu Desnoyers */ + + tmp_toolbar_icon = create_pixmap (MWindow, "stock_refresh_24.png"); + tlbRedraw = gtk_toolbar_append_element (GTK_TOOLBAR (MToolbar1), + GTK_TOOLBAR_CHILD_BUTTON, + NULL, + "", + "Redraw", 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 (tlbRedraw); + gtk_container_set_border_width (GTK_CONTAINER (tlbRedraw), 1); + + tmp_toolbar_icon = create_pixmap (MWindow, "stock_redo_24.png"); + tlbContinueProcessing = gtk_toolbar_append_element (GTK_TOOLBAR (MToolbar1), + GTK_TOOLBAR_CHILD_BUTTON, + NULL, + "", + "Continue Processing", 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 (tlbContinueProcessing); + gtk_container_set_border_width (GTK_CONTAINER (tlbContinueProcessing), 1); + + tmp_toolbar_icon = create_pixmap (MWindow, "stock_stop_24.png"); + tlbStopProcessing = gtk_toolbar_append_element (GTK_TOOLBAR (MToolbar1), + GTK_TOOLBAR_CHILD_BUTTON, + NULL, + "", + "Stop Processing", 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 (tlbStopProcessing); + gtk_container_set_border_width (GTK_CONTAINER (tlbStopProcessing), 1); + GLADE_HOOKUP_OBJECT (MWindow, tlbStopProcessing, "StopProcessingButton"); + + gtk_toolbar_append_space (GTK_TOOLBAR (MToolbar1)); tmp_toolbar_icon = create_pixmap (MWindow, "stock_zoom_in_24.png"); @@ -508,7 +566,8 @@ 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, @@ -530,7 +589,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"); @@ -577,6 +636,7 @@ create_MWindow (void) 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); gtk_widget_show (empty_notebook_page); @@ -597,6 +657,7 @@ create_MWindow (void) g_signal_connect ((gpointer) MWindow, "configure-event", G_CALLBACK (on_MWindow_configure), NULL); + // g_signal_connect ((gpointer) EmptyTraceset, "activate", // G_CALLBACK (on_empty_traceset_activate), // NULL); @@ -674,23 +735,32 @@ create_MWindow (void) g_signal_connect ((gpointer) RemoveViewer, "activate", G_CALLBACK (on_remove_viewer_activate), NULL); - g_signal_connect ((gpointer) Filter, "activate", - G_CALLBACK (on_trace_filter_activate), - NULL); + //g_signal_connect ((gpointer) Filter, "activate", + // G_CALLBACK (on_trace_filter_activate), + // NULL); // g_signal_connect ((gpointer) Facility, "activate", // G_CALLBACK (on_trace_facility_activate), // NULL); // g_signal_connect ((gpointer) insert_viewer_test, "activate", // G_CALLBACK (on_insert_viewer_test_activate), // NULL); + g_signal_connect ((gpointer) LoadLibrary, "activate", + G_CALLBACK (on_load_library_activate), + NULL); + g_signal_connect ((gpointer) UnloadLibrary, "activate", + G_CALLBACK (on_unload_library_activate), + NULL); g_signal_connect ((gpointer) LoadModule, "activate", G_CALLBACK (on_load_module_activate), NULL); g_signal_connect ((gpointer) UnloadModule, "activate", G_CALLBACK (on_unload_module_activate), NULL); - g_signal_connect ((gpointer) AddModuleSearchPath, "activate", - G_CALLBACK (on_add_module_search_path_activate), + g_signal_connect ((gpointer) AddLibrarySearchPath, "activate", + G_CALLBACK (on_add_library_search_path_activate), + NULL); + g_signal_connect ((gpointer) RemoveLibrarySearchPath, "activate", + G_CALLBACK (on_remove_library_search_path_activate), NULL); /* g_signal_connect ((gpointer) Color, "activate", @@ -726,6 +796,15 @@ create_MWindow (void) g_signal_connect ((gpointer) tlbRemoveTrace, "clicked", G_CALLBACK (on_button_remove_trace_clicked), NULL); + g_signal_connect ((gpointer) tlbRedraw, "clicked", + G_CALLBACK (on_button_redraw_clicked), + NULL); + g_signal_connect ((gpointer) tlbContinueProcessing, "clicked", + G_CALLBACK (on_button_continue_processing_clicked), + NULL); + g_signal_connect ((gpointer) tlbStopProcessing, "clicked", + G_CALLBACK (on_button_stop_processing_clicked), + NULL); /* g_signal_connect ((gpointer) tlbSave, "clicked", G_CALLBACK (on_button_save_clicked), @@ -743,14 +822,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); @@ -813,9 +892,12 @@ create_MWindow (void) // GLADE_HOOKUP_OBJECT (MWindow, insert_viewer_test, "insert_viewer_test"); GLADE_HOOKUP_OBJECT (MWindow, PluginMenuTitle, "PluginMenuTitle"); GLADE_HOOKUP_OBJECT (MWindow, PluginMenuTitle_menu, "PluginMenuTitle_menu"); + GLADE_HOOKUP_OBJECT (MWindow, LoadLibrary, "LoadLibrary"); + GLADE_HOOKUP_OBJECT (MWindow, UnloadLibrary, "UnloadLibrary"); GLADE_HOOKUP_OBJECT (MWindow, LoadModule, "LoadModule"); GLADE_HOOKUP_OBJECT (MWindow, UnloadModule, "UnloadModule"); - GLADE_HOOKUP_OBJECT (MWindow, AddModuleSearchPath, "AddModuleSearchPath"); + GLADE_HOOKUP_OBJECT (MWindow, AddLibrarySearchPath, "AddLibrarySearchPath"); + GLADE_HOOKUP_OBJECT (MWindow, RemoveLibrarySearchPath, "RemoveLibrarySearchPath"); // GLADE_HOOKUP_OBJECT (MWindow, OptionMenuTitle, "OptionMenuTitle"); // GLADE_HOOKUP_OBJECT (MWindow, OptionMenuTitle_menu, "OptionMenuTitle_menu"); // GLADE_HOOKUP_OBJECT (MWindow, Color, "Color");