From 381229ee5afedab4dc7bff54a1aaed55e9aa73c7 Mon Sep 17 00:00:00 2001 From: compudj Date: Wed, 14 Sep 2005 22:16:09 +0000 Subject: [PATCH] layout ok git-svn-id: http://ltt.polymtl.ca/svn@1189 04897980-b3bd-0310-b5e0-8ef037075253 --- .../gui/tracecontrol/TraceControlPause.xpm | 30 ++++ .../gui/tracecontrol/TraceControlStart.xpm | 30 ++++ .../gui/tracecontrol/TraceControlStop.xpm | 30 ++++ .../modules/gui/tracecontrol/tracecontrol.c | 136 +++++++++++++++++- 4 files changed, 222 insertions(+), 4 deletions(-) create mode 100644 ltt/branches/poly/lttv/modules/gui/tracecontrol/TraceControlPause.xpm create mode 100644 ltt/branches/poly/lttv/modules/gui/tracecontrol/TraceControlStart.xpm create mode 100644 ltt/branches/poly/lttv/modules/gui/tracecontrol/TraceControlStop.xpm diff --git a/ltt/branches/poly/lttv/modules/gui/tracecontrol/TraceControlPause.xpm b/ltt/branches/poly/lttv/modules/gui/tracecontrol/TraceControlPause.xpm new file mode 100644 index 00000000..ac2c2734 --- /dev/null +++ b/ltt/branches/poly/lttv/modules/gui/tracecontrol/TraceControlPause.xpm @@ -0,0 +1,30 @@ +/* XPM */ +static char * TraceControlPause_xpm[] = { +"22 22 5 1", +" c None", +". c #000000", +"+ c #570404", +"@ c #EE8100", +"# c #053C0A", +" ..... ", +" ....... ", +" ...+++... ", +" ..+++++.. ", +" ..+++++.. ", +" ..+++++.. ", +" ...+++... ", +" ......... ", +" ...@@@... ", +" ..@@@@@.. ", +" ..@@@@@.. ", +" ..@@@@@.. ", +" ...@@@... ", +" ......... ", +" ...###... ", +" ..#####.. ", +" ..#####.. ", +" ..#####.. ", +" ..###.. ", +" ....... ", +" ....... ", +" ..... "}; diff --git a/ltt/branches/poly/lttv/modules/gui/tracecontrol/TraceControlStart.xpm b/ltt/branches/poly/lttv/modules/gui/tracecontrol/TraceControlStart.xpm new file mode 100644 index 00000000..fc225d01 --- /dev/null +++ b/ltt/branches/poly/lttv/modules/gui/tracecontrol/TraceControlStart.xpm @@ -0,0 +1,30 @@ +/* XPM */ +static char * TraceControlStart_xpm[] = { +"22 22 5 1", +" c None", +". c #000000", +"+ c #570404", +"@ c #6B3A00", +"# c #12E826", +" ..... ", +" ....... ", +" ...+++... ", +" ..+++++.. ", +" ..+++++.. ", +" ..+++++.. ", +" ...+++... ", +" ......... ", +" ...@@@... ", +" ..@@@@@.. ", +" ..@@@@@.. ", +" ..@@@@@.. ", +" ...@@@... ", +" ......... ", +" ...###... ", +" ..#####.. ", +" ..#####.. ", +" ..#####.. ", +" ..###.. ", +" ....... ", +" ....... ", +" ..... "}; diff --git a/ltt/branches/poly/lttv/modules/gui/tracecontrol/TraceControlStop.xpm b/ltt/branches/poly/lttv/modules/gui/tracecontrol/TraceControlStop.xpm new file mode 100644 index 00000000..b01067be --- /dev/null +++ b/ltt/branches/poly/lttv/modules/gui/tracecontrol/TraceControlStop.xpm @@ -0,0 +1,30 @@ +/* XPM */ +static char * TraceControlStop_xpm[] = { +"22 22 5 1", +" c None", +". c #000000", +"+ c #D00A0A", +"@ c #6B3A00", +"# c #053C0A", +" ..... ", +" ....... ", +" ...+++... ", +" ..+++++.. ", +" ..+++++.. ", +" ..+++++.. ", +" ...+++... ", +" ......... ", +" ...@@@... ", +" ..@@@@@.. ", +" ..@@@@@.. ", +" ..@@@@@.. ", +" ...@@@... ", +" ......... ", +" ...###... ", +" ..#####.. ", +" ..#####.. ", +" ..#####.. ", +" ..###.. ", +" ....... ", +" ....... ", +" ..... "}; diff --git a/ltt/branches/poly/lttv/modules/gui/tracecontrol/tracecontrol.c b/ltt/branches/poly/lttv/modules/gui/tracecontrol/tracecontrol.c index 5f998f3d..d3251b8b 100644 --- a/ltt/branches/poly/lttv/modules/gui/tracecontrol/tracecontrol.c +++ b/ltt/branches/poly/lttv/modules/gui/tracecontrol/tracecontrol.c @@ -35,6 +35,9 @@ #include #include "hTraceControlInsert.xpm" +#include "TraceControlStart.xpm" +#include "TraceControlPause.xpm" +#include "TraceControlStop.xpm" GSList *g_control_list = NULL ; @@ -119,12 +122,41 @@ gui_control(Tab *tab) * starts with 2 rows and 5 columns and * expands when expressions added */ - tcd->f_main_box = gtk_table_new(13,2,FALSE); + tcd->f_main_box = gtk_table_new(14,7,FALSE); gtk_table_set_row_spacings(GTK_TABLE(tcd->f_main_box),5); gtk_table_set_col_spacings(GTK_TABLE(tcd->f_main_box),5); gtk_container_add(GTK_CONTAINER(tcd->f_window), GTK_WIDGET(tcd->f_main_box)); + /* + * start/pause/stop buttons + */ + GdkPixbuf *pixbuf; + GtkWidget *image; + pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)TraceControlStart_xpm); + image = gtk_image_new_from_pixbuf(pixbuf); + GtkWidget *start_button = gtk_button_new_with_label("start"); + gtk_button_set_image(GTK_BUTTON(start_button), image); + gtk_button_set_alignment(GTK_BUTTON(start_button), 0.0, 0.0); + gtk_widget_show (start_button); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),start_button,6,7,0,1,GTK_FILL,GTK_FILL,2,2); + + pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)TraceControlPause_xpm); + image = gtk_image_new_from_pixbuf(pixbuf); + GtkWidget *pause_button = gtk_button_new_with_label("pause"); + gtk_button_set_image(GTK_BUTTON(pause_button), image); + gtk_button_set_alignment(GTK_BUTTON(pause_button), 0.0, 0.0); + gtk_widget_show (pause_button); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),pause_button,6,7,1,2,GTK_FILL,GTK_FILL,2,2); + + pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)TraceControlStop_xpm); + image = gtk_image_new_from_pixbuf(pixbuf); + GtkWidget *stop_button = gtk_button_new_with_label("stop"); + gtk_button_set_image(GTK_BUTTON(stop_button), image); + gtk_button_set_alignment(GTK_BUTTON(stop_button), 0.0, 0.0); + gtk_widget_show (stop_button); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),stop_button,6,7,2,3,GTK_FILL,GTK_FILL,2,2); + /* * First half of the filter window * - textual entry of filter expression @@ -134,11 +166,107 @@ gui_control(Tab *tab) gtk_widget_show (username_label); GtkWidget *username_entry = gtk_entry_new(); gtk_entry_set_text(GTK_ENTRY(username_entry),"root"); - gtk_widget_show (username_entry); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),username_label,0,2,0,1,GTK_FILL,GTK_FILL,2,2); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),username_entry,2,6,0,1,GTK_FILL|GTK_EXPAND|GTK_SHRINK,GTK_FILL,0,0); + + + + GtkWidget *password_label = gtk_label_new("Password:"); + gtk_widget_show (password_label); + GtkWidget *password_entry = gtk_entry_new(); + gtk_entry_set_visibility(GTK_ENTRY(password_entry), FALSE); + gtk_widget_show (password_entry); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),password_label,0,2,1,2,GTK_FILL,GTK_FILL,2,2); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),password_entry,2,6,1,2,GTK_FILL|GTK_EXPAND|GTK_SHRINK,GTK_FILL,0,0); + + + GtkWidget *channel_dir_label = gtk_label_new("Channel directory:"); + gtk_widget_show (channel_dir_label); + GtkWidget *channel_dir_entry = gtk_entry_new(); + gtk_entry_set_text(GTK_ENTRY(channel_dir_entry),"/mnt/relayfs/ltt"); + gtk_widget_show (channel_dir_entry); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),channel_dir_label,0,2,2,3,GTK_FILL,GTK_FILL,2,2); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),channel_dir_entry,2,6,2,3,GTK_FILL|GTK_EXPAND|GTK_SHRINK,GTK_FILL,0,0); + + GtkWidget *trace_dir_label = gtk_label_new("Trace directory:"); + gtk_widget_show (trace_dir_label); + GtkWidget *trace_dir_entry = gtk_entry_new(); + gtk_entry_set_text(GTK_ENTRY(trace_dir_entry),"/tmp/trace1"); + gtk_widget_show (trace_dir_entry); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),trace_dir_label,0,2,3,4,GTK_FILL,GTK_FILL,2,2); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),trace_dir_entry,2,6,3,4,GTK_FILL|GTK_EXPAND|GTK_SHRINK,GTK_FILL,0,0); + + GtkWidget *trace_name_label = gtk_label_new("Trace name:"); + gtk_widget_show (trace_name_label); + GtkWidget *trace_name_entry = gtk_entry_new(); + gtk_entry_set_text(GTK_ENTRY(trace_name_entry),"trace"); + gtk_widget_show (trace_name_entry); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),trace_name_label,0,2,4,5,GTK_FILL,GTK_FILL,2,2); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),trace_name_entry,2,6,4,5,GTK_FILL|GTK_EXPAND|GTK_SHRINK,GTK_FILL,0,0); + + GtkWidget *trace_mode_label = gtk_label_new("Trace mode "); + gtk_widget_show (trace_mode_label); + GtkWidget *trace_mode_combo = gtk_combo_box_new_text(); + gtk_combo_box_append_text(GTK_COMBO_BOX(trace_mode_combo), + "normal"); + gtk_combo_box_append_text(GTK_COMBO_BOX(trace_mode_combo), + "flight recorder"); + gtk_combo_box_set_active(GTK_COMBO_BOX(trace_mode_combo), 0); + gtk_widget_show (trace_mode_combo); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),trace_mode_label,0,2,5,6,GTK_FILL,GTK_FILL,2,2); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),trace_mode_combo,2,6,5,6,GTK_FILL|GTK_EXPAND|GTK_SHRINK,GTK_FILL,0,0); + + GtkWidget *start_daemon_label = gtk_label_new("Start daemon "); + gtk_widget_show (start_daemon_label); + GtkWidget *start_daemon_check = gtk_check_button_new(); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(start_daemon_check), TRUE); + gtk_widget_show (start_daemon_check); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),start_daemon_label,0,2,6,7,GTK_FILL,GTK_FILL,2,2); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),start_daemon_check,2,6,6,7,GTK_FILL,GTK_FILL,0,0); + + GtkWidget *optional_label = gtk_label_new("Optional fields "); + gtk_widget_show (optional_label); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),optional_label,0,6,7,8,GTK_FILL,GTK_FILL,2,2); + + GtkWidget *subbuf_size_label = gtk_label_new("Subbuffer size:"); + gtk_widget_show (subbuf_size_label); + GtkWidget *subbuf_size_entry = gtk_entry_new(); + gtk_widget_show (subbuf_size_entry); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),subbuf_size_label,0,2,8,9,GTK_FILL,GTK_FILL,2,2); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),subbuf_size_entry,2,6,8,9,GTK_FILL|GTK_EXPAND|GTK_SHRINK,GTK_FILL,0,0); + + GtkWidget *subbuf_num_label = gtk_label_new("Number of subbuffers:"); + gtk_widget_show (subbuf_num_label); + GtkWidget *subbuf_num_entry = gtk_entry_new(); + gtk_widget_show (subbuf_num_entry); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),subbuf_num_label,0,2,9,10,GTK_FILL,GTK_FILL,2,2); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),subbuf_num_entry,2,6,9,10,GTK_FILL|GTK_EXPAND|GTK_SHRINK,GTK_FILL,0,0); + + GtkWidget *lttctl_path_label = gtk_label_new("path to lttctl:"); + gtk_widget_show (lttctl_path_label); + GtkWidget *lttctl_path_entry = gtk_entry_new(); + gtk_widget_show (lttctl_path_entry); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),lttctl_path_label,0,2,10,11,GTK_FILL,GTK_FILL,2,2); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),lttctl_path_entry,2,6,10,11,GTK_FILL|GTK_EXPAND|GTK_SHRINK,GTK_FILL,0,0); + + + GtkWidget *lttd_path_label = gtk_label_new("path to lttd:"); + gtk_widget_show (lttd_path_label); + GtkWidget *lttd_path_entry = gtk_entry_new(); + gtk_widget_show (lttd_path_entry); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),lttd_path_label,0,2,11,12,GTK_FILL,GTK_FILL,2,2); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),lttd_path_entry,2,6,11,12,GTK_FILL|GTK_EXPAND|GTK_SHRINK,GTK_FILL,0,0); - gtk_table_attach( GTK_TABLE(tcd->f_main_box),username_label,0,6,0,1,GTK_FILL,GTK_FILL,0,0); - gtk_table_attach( GTK_TABLE(tcd->f_main_box),username_entry,6,7,0,1,GTK_FILL,GTK_FILL,0,0); + + GtkWidget *fac_path_label = gtk_label_new("path to facilities:"); + gtk_widget_show (fac_path_label); + GtkWidget *fac_path_entry = gtk_entry_new(); + gtk_entry_set_text(GTK_ENTRY(fac_path_entry),"/usr/share/LinuxTraceToolkitViewer/facilities"); + gtk_widget_set_size_request(fac_path_entry, 250, -1); + gtk_widget_show (fac_path_entry); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),fac_path_label,0,2,12,13,GTK_FILL,GTK_FILL,2,2); + gtk_table_attach( GTK_TABLE(tcd->f_main_box),fac_path_entry,2,6,12,13,GTK_FILL|GTK_EXPAND|GTK_SHRINK,GTK_FILL,0,0); /* -- 2.34.1