complete new layout of the summary dialog

svn path=/trunk/; revision=10933

1 files changed, 184 insertions, 159 deletions

diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c
index d609cdd99d..3c7e6ef977 100644
--- a/gtk/summary_dlg.c
+++ b/gtk/summary_dlg.c
@@ -1,7 +1,7 @@
 /* summary_dlg.c
  * Routines for capture file summary window
  *
- * $Id: summary_dlg.c,v 1.28 2004/03/13 15:15:25 ulfl Exp $
+ * $Id: summary_dlg.c,v 1.29 2004/05/20 23:01:53 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -38,249 +38,274 @@
 #include "ui_util.h"
 #include "compat_macros.h"
 
-#define SUM_STR_MAX 1024
+#define SUM_STR_MAX     1024
+#define FILTER_SNIP_LEN 50
 
 
 static void
-add_string_to_box(gchar *str, GtkWidget *box)
+add_string_to_table_sensitive(GtkWidget *list, guint *row, gchar *title, gchar *value, gboolean sensitive)
 {
-  GtkWidget *lb;
-  lb = gtk_label_new(str);
-  gtk_misc_set_alignment(GTK_MISC(lb), 0.0, 0.5);
-  gtk_box_pack_start(GTK_BOX(box), lb,FALSE,FALSE, 0);
-  gtk_widget_show(lb);
+    GtkWidget *label;
+    gchar     *indent;
+
+    if(strlen(value) != 0) {
+        indent = g_strdup_printf("   %s", title);
+    } else {
+        indent = g_strdup(title);
+    }
+    label = gtk_label_new(indent);
+    g_free(indent);
+    gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+    gtk_widget_set_sensitive(label, sensitive);
+    gtk_table_attach_defaults(GTK_TABLE(list), label, 0, 1, *row, *row+1);
+
+    label = gtk_label_new(value);
+    gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+    gtk_widget_set_sensitive(label, sensitive);
+    gtk_table_attach_defaults(GTK_TABLE(list), label, 1, 2, *row, *row+1);
+
+    *row = *row + 1;
+}
+
+static void
+add_string_to_table(GtkWidget *list, guint *row, gchar *title, gchar *value)
+{
+    add_string_to_table_sensitive(list, row, title, value, TRUE);
 }
 
 
+static void
+add_string_to_list(GtkWidget *list, guint *row, gchar *title, gchar *captured, gchar *displayed)
+{
+    simple_list_append(list, 0, title, 1, captured, 2, displayed, -1);
+}
+
 void
 summary_open_cb(GtkWidget *w _U_, gpointer d _U_)
 {
   summary_tally summary;
   GtkWidget     *sum_open_w,
-                *main_vb, *file_fr, *data_fr, *capture_fr, *file_box,
-		*filter_box, *filter_fr,
-		*data_box, *capture_box, *bbox, *close_bt;
+                *main_vb, *bbox, *close_bt;
+  GtkWidget     *table;
+  GtkWidget     *list;
+  char          *titles[] = { "Traffic", "Captured", "Displayed" };
 
   gchar         string_buff[SUM_STR_MAX];
+  gchar         string_buff2[SUM_STR_MAX];
 
   double        seconds;
+  double        disp_seconds;
   guint         offset;
+  guint         snip;
+  guint         row;
   gchar        *str_dup;
   gchar        *str_work;
 
- /* initialize the tally */
-  summary_fill_in(&summary);
 
   /* initial computations */
+  summary_fill_in(&summary);
   seconds = summary.stop_time - summary.start_time;
-  sum_open_w = window_new(GTK_WINDOW_TOPLEVEL, "Ethereal: Summary");
+  disp_seconds = summary.filtered_stop - summary.filtered_start;
+
+  sum_open_w = dlg_window_new("Ethereal: Summary");
 
   /* Container for each row of widgets */
-  main_vb = gtk_vbox_new(FALSE, 3);
-  gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
+  main_vb = gtk_vbox_new(FALSE, 12);
+  gtk_container_border_width(GTK_CONTAINER(main_vb), 12);
   gtk_container_add(GTK_CONTAINER(sum_open_w), main_vb);
-  gtk_widget_show(main_vb);
 
-  /* File frame */
-  file_fr = gtk_frame_new("File");
-  gtk_container_add(GTK_CONTAINER(main_vb), file_fr);
-  gtk_widget_show(file_fr);
+  /* table */
+  table = gtk_table_new(1, 2, FALSE);
+  gtk_table_set_col_spacings(GTK_TABLE(table), 6);
+  gtk_table_set_row_spacings(GTK_TABLE(table), 3);
+  gtk_container_add(GTK_CONTAINER(main_vb), table);
+  row = 0;
+
 
-  file_box = gtk_vbox_new(FALSE, 3);
-  gtk_container_border_width(GTK_CONTAINER(file_box), 5);
-  gtk_container_add(GTK_CONTAINER(file_fr), file_box);
-  gtk_widget_show(file_box);
+  /* File */
+  add_string_to_table(table, &row, "File", "");
 
   /* filename */
-  g_snprintf(string_buff, SUM_STR_MAX, "Name: %s", summary.filename);
-  add_string_to_box(string_buff, file_box);
+  g_snprintf(string_buff, SUM_STR_MAX, "%s", summary.filename);
+  add_string_to_table(table, &row, "Name:", string_buff);
 
   /* length */
-  g_snprintf(string_buff, SUM_STR_MAX, "Length: %lu", summary.file_length);
-  add_string_to_box(string_buff, file_box);
+  g_snprintf(string_buff, SUM_STR_MAX, "%lu bytes", summary.file_length);
+  add_string_to_table(table, &row, "Length:", string_buff);
+
+  /* seconds */
+  g_snprintf(string_buff, SUM_STR_MAX, "%.3f sec", summary.elapsed_time);
+  add_string_to_table(table, &row, "Elapsed time:", string_buff);
 
   /* format */
-  g_snprintf(string_buff, SUM_STR_MAX, "Format: %s", wtap_file_type_string(summary.encap_type));
-  add_string_to_box(string_buff, file_box);
+  g_snprintf(string_buff, SUM_STR_MAX, "%s", wtap_file_type_string(summary.encap_type));
+  add_string_to_table(table, &row, "Format:", string_buff);
 
   if (summary.has_snap) {
     /* snapshot length */
-    g_snprintf(string_buff, SUM_STR_MAX, "Snapshot length: %u", summary.snap);
-    add_string_to_box(string_buff, file_box);
+    g_snprintf(string_buff, SUM_STR_MAX, "%u bytes", summary.snap);
+    add_string_to_table(table, &row, "Packet size limit:", string_buff);
   }
 
-  /* Data frame */
-  data_fr = gtk_frame_new("Data");
-  gtk_container_add(GTK_CONTAINER(main_vb), data_fr);
-  gtk_widget_show(data_fr);
-
-  data_box = gtk_vbox_new(FALSE, 3);
-  gtk_container_border_width(GTK_CONTAINER(data_box), 5);
-  gtk_container_add(GTK_CONTAINER(data_fr), data_box);
-  gtk_widget_show(data_box);
 
-  /* seconds */
-  g_snprintf(string_buff, SUM_STR_MAX, "Elapsed time: %.3f seconds", summary.elapsed_time);
-  add_string_to_box(string_buff, data_box);
+  /* Capture */
+  add_string_to_table(table, &row, "", "");
+  add_string_to_table_sensitive(table, &row, "Capture", "", (gboolean) summary.iface);
 
-  g_snprintf(string_buff, SUM_STR_MAX, "Between first and last packet: %.3f seconds", seconds);
-  add_string_to_box(string_buff, data_box);
-
-  /* Packet count */
-  g_snprintf(string_buff, SUM_STR_MAX, "Packet count: %i", summary.packet_count);
-  add_string_to_box(string_buff, data_box);
-
-  /* Filtered Packet count */
-  /* Unless there is none filter, we move informations about filtered packets in a separate frame */
-  if (!summary.dfilter)
-	add_string_to_box("Filtered packet count: 0", data_box);
-
-  /* Marked Packet count */
-  g_snprintf(string_buff, SUM_STR_MAX, "Marked packet count: %i", summary.marked_count);
-  add_string_to_box(string_buff, data_box);
-
-  /* Packets per second */
-  if (seconds > 0){
-    g_snprintf(string_buff, SUM_STR_MAX, "Avg. packets/sec: %.3f", summary.packet_count/seconds);
-    add_string_to_box(string_buff, data_box);
-  }
-
-  /* Packet size */
-  if (summary.packet_count > 0){
-    g_snprintf(string_buff, SUM_STR_MAX, "Avg. packet size: %.3f bytes",
-      (float)summary.bytes/summary.packet_count);
-    add_string_to_box(string_buff, data_box);
+  /* interface */
+  if (summary.iface) {
+    g_snprintf(string_buff, SUM_STR_MAX, "%s", summary.iface);
+  } else {
+    g_snprintf(string_buff, SUM_STR_MAX, "unknown");
   }
+  add_string_to_table_sensitive(table, &row, "Interface:", string_buff, (gboolean) summary.iface);
 
   /* Dropped count */
   if (summary.drops_known) {
-    g_snprintf(string_buff, SUM_STR_MAX, "Dropped packets: %u", summary.drops);
-    add_string_to_box(string_buff, data_box);
+    g_snprintf(string_buff, SUM_STR_MAX, "%u", summary.drops);
+  } else {
+    g_snprintf(string_buff, SUM_STR_MAX, "unknown");
   }
+  add_string_to_table_sensitive(table, &row, "Dropped packets:", string_buff, (gboolean) summary.iface);
 
-  /* Byte count */
-  g_snprintf(string_buff, SUM_STR_MAX, "Bytes of traffic: %d", summary.bytes);
-  add_string_to_box(string_buff, data_box);
-
-  /* Bytes per second */
-  if (seconds > 0){
-    g_snprintf(string_buff, SUM_STR_MAX, "Avg. bytes/sec: %.3f", summary.bytes/seconds);
-    add_string_to_box(string_buff, data_box);
-
-    /* MBit per second */
-    g_snprintf(string_buff, SUM_STR_MAX, "Avg. Mbit/sec: %.3f",
-             summary.bytes * 8.0 / (seconds * 1000.0 * 1000.0));
-    add_string_to_box(string_buff, data_box);
+#ifdef HAVE_LIBPCAP
+  /* Capture filter */
+  if (summary.cfilter && summary.cfilter[0] != '\0') {
+    g_snprintf(string_buff, SUM_STR_MAX, "%s", summary.cfilter);
+  } else {
+    g_snprintf(string_buff, SUM_STR_MAX, "none");
   }
+  add_string_to_table_sensitive(table, &row, "Capture filter:", string_buff, (gboolean) summary.iface);
+#endif
 
-  /* Filtered packets frame */
-  filter_fr = gtk_frame_new("Data in filtered packets");
-  gtk_container_add(GTK_CONTAINER(main_vb), filter_fr);
-  gtk_widget_show(filter_fr);
 
-  filter_box = gtk_vbox_new( FALSE, 3);
-  gtk_container_border_width(GTK_CONTAINER(filter_box), 5);
-  gtk_container_add(GTK_CONTAINER(filter_fr), filter_box);
-  gtk_widget_show(filter_box);
+  /* Data */
+  add_string_to_table(table, &row, "", "");
+  add_string_to_table(table, &row, "Display", "");
 
   if (summary.dfilter) {
-    double seconds;
-
     /* Display filter */
     /* limit each row to some reasonable length */
-    str_dup = g_strdup_printf("Display filter: %s", summary.dfilter);
+    str_dup = g_strdup_printf("%s", summary.dfilter);
     str_work = g_strdup(str_dup);
     offset = 0;
-    while(strlen(str_work) > 100) {
-        str_work[100] = '\0';
-        add_string_to_box(str_work, filter_box);
+    snip = 0;
+    while(strlen(str_work) > FILTER_SNIP_LEN) {
+        str_work[FILTER_SNIP_LEN] = '\0';
+        add_string_to_table(table, &row, (snip == 0) ? "Display filter:" : "", str_work);
         g_free(str_work);
-        offset+=100;
+        offset+=FILTER_SNIP_LEN;
         str_work = g_strdup(&str_dup[offset]);
+        snip++;
     }
     
-    add_string_to_box(str_work, filter_box);
+    add_string_to_table(table, &row, (snip == 0) ? "Display filter:" : "", str_work);
     g_free(str_work);
     g_free(str_dup);
+  } else {
+    /* Display filter */
+    add_string_to_table(table, &row, "Display filter:", "none");
+  }
 
-    /* seconds */
-    seconds = (summary.filtered_stop - summary.filtered_start);
-    g_snprintf(string_buff, SUM_STR_MAX, "Between first and last packet: %.3f seconds", seconds);
-    add_string_to_box(string_buff, filter_box);
+  /* Marked Packet count */
+  g_snprintf(string_buff, SUM_STR_MAX, "%i", summary.marked_count);
+  add_string_to_table(table, &row, "Marked packets:", string_buff);
 
-    /* Packet count */
-    g_snprintf(string_buff, SUM_STR_MAX, "Packet count: %i", summary.filtered_count);
-    add_string_to_box(string_buff, filter_box);
 
-    /* Packets per second */
-    if (seconds > 0){
-      g_snprintf(string_buff, SUM_STR_MAX, "Avg. packets/sec: %.3f", summary.filtered_count/seconds);
-      add_string_to_box(string_buff, filter_box);
-    }
+  /* Traffic */
+  list = simple_list_new(3, titles);
+  gtk_container_add(GTK_CONTAINER(main_vb), list);
 
-    /* Packet size */
-    if (summary.filtered_count > 0){
-      g_snprintf(string_buff, SUM_STR_MAX, "Avg. packet size: %.3f bytes",
-          (float) summary.filtered_bytes/summary.filtered_count);
-      add_string_to_box(string_buff, filter_box);
-    }
-
-    /* Byte count */
-    g_snprintf(string_buff, SUM_STR_MAX, "Bytes of traffic: %d", summary.filtered_bytes);
-    add_string_to_box(string_buff, filter_box);
+  g_snprintf(string_buff, SUM_STR_MAX, "%.3f sec", seconds);
+  if(summary.dfilter) {
+    g_snprintf(string_buff2, SUM_STR_MAX, "%.3f sec", disp_seconds);
+  } else {
+    g_snprintf(string_buff2, SUM_STR_MAX, "");
+  }
+  add_string_to_list(list, &row, "Between first and last packet", string_buff, string_buff2);
 
-    /* Bytes per second */
-    if (seconds > 0){
-      g_snprintf(string_buff, SUM_STR_MAX, "Avg. bytes/sec: %.3f", summary.filtered_bytes/seconds);
-      add_string_to_box(string_buff, filter_box);
+  /* Packet count */
+  g_snprintf(string_buff, SUM_STR_MAX, "%i", summary.packet_count);
+  if(summary.dfilter) {
+    g_snprintf(string_buff2, SUM_STR_MAX, "%i", summary.filtered_count);
+  } else {
+    g_snprintf(string_buff2, SUM_STR_MAX, "");
+  }
+  add_string_to_list(list, &row, "Packets", string_buff, string_buff2);
 
-      /* MBit per second */
-      g_snprintf(string_buff, SUM_STR_MAX, "Avg. Mbit/sec: %.3f",
-	       summary.filtered_bytes * 8.0 / (seconds * 1000.0 * 1000.0));
-      add_string_to_box(string_buff, filter_box);
-    }
+  /* Packets per second */
+  if (seconds > 0){
+    g_snprintf(string_buff, SUM_STR_MAX, "%.3f", summary.packet_count/seconds);
   } else {
-    /* Display filter */
-    g_snprintf(string_buff, SUM_STR_MAX, "Display filter: none");
-    add_string_to_box(string_buff, filter_box);
+    g_snprintf(string_buff, SUM_STR_MAX, "");
+  }
+  if(summary.dfilter && disp_seconds > 0){
+      g_snprintf(string_buff2, SUM_STR_MAX, "%.3f", summary.filtered_count/disp_seconds);
+  } else {
+      g_snprintf(string_buff2, SUM_STR_MAX, "");
   }
+  add_string_to_list(list, &row, "Avg. packets/sec", string_buff, string_buff2);
 
-  /* Capture Frame */
-  capture_fr = gtk_frame_new("Capture");
-  gtk_container_add(GTK_CONTAINER(main_vb), capture_fr);
-  gtk_widget_show(capture_fr);
+  /* Packet size */
+  if (summary.packet_count > 0){
+    g_snprintf(string_buff, SUM_STR_MAX, "%.3f bytes",
+      (float)summary.bytes/summary.packet_count);
+  } else {
+    g_snprintf(string_buff, SUM_STR_MAX, "");
+  }
+  if (summary.dfilter && summary.filtered_count > 0){
+      g_snprintf(string_buff2, SUM_STR_MAX, "%.3f bytes",
+          (float) summary.filtered_bytes/summary.filtered_count);
+  } else {
+      g_snprintf(string_buff2, SUM_STR_MAX, "");
+  }
+  add_string_to_list(list, &row, "Avg. packet size", string_buff, string_buff2);
 
-  capture_box = gtk_vbox_new(FALSE, 3);
-  gtk_container_border_width(GTK_CONTAINER(capture_box), 5);
-  gtk_container_add(GTK_CONTAINER(capture_fr), capture_box);
-  gtk_widget_show(capture_box);
+  /* Byte count */
+  g_snprintf(string_buff, SUM_STR_MAX, "%d", summary.bytes);
+  if (summary.dfilter && summary.filtered_count > 0){
+      g_snprintf(string_buff2, SUM_STR_MAX, "%d", summary.filtered_bytes);
+  } else {
+      g_snprintf(string_buff2, SUM_STR_MAX, "");
+  }
+  add_string_to_list(list, &row, "Bytes", string_buff, string_buff2);
 
-  /* interface */
-  if (summary.iface) {
-    g_snprintf(string_buff, SUM_STR_MAX, "Interface: %s", summary.iface);
+  /* Bytes per second */
+  if (seconds > 0){
+    g_snprintf(string_buff, SUM_STR_MAX, "%.3f", summary.bytes/seconds);
+  } else {
+    g_snprintf(string_buff, SUM_STR_MAX, "");
+  }
+  if (summary.dfilter && disp_seconds > 0){
+      g_snprintf(string_buff2, SUM_STR_MAX, "%.3f", summary.filtered_bytes/disp_seconds);
   } else {
-    g_snprintf(string_buff, SUM_STR_MAX, "Interface: unknown");
+      g_snprintf(string_buff2, SUM_STR_MAX, "");
   }
-  add_string_to_box(string_buff, capture_box);
+  add_string_to_list(list, &row, "Avg. bytes/sec", string_buff, string_buff2);
 
-#ifdef HAVE_LIBPCAP
-  /* Capture filter */
-  if (summary.cfilter && summary.cfilter[0] != '\0') {
-    g_snprintf(string_buff, SUM_STR_MAX, "Capture filter: %s", summary.cfilter);
+  /* MBit per second */
+  if (seconds > 0){
+    g_snprintf(string_buff, SUM_STR_MAX, "%.3f", summary.bytes * 8.0 / (seconds * 1000.0 * 1000.0));
   } else {
-    g_snprintf(string_buff, SUM_STR_MAX, "Capture filter: none");
+    g_snprintf(string_buff, SUM_STR_MAX, "");
   }
-  add_string_to_box(string_buff, capture_box);
-#endif
+  if (summary.dfilter && disp_seconds > 0){
+      g_snprintf(string_buff2, SUM_STR_MAX, "%.3f", 
+          summary.filtered_bytes * 8.0 / (disp_seconds * 1000.0 * 1000.0));
+  } else {
+      g_snprintf(string_buff2, SUM_STR_MAX, "");
+  }
+  add_string_to_list(list, &row, "Avg. MBit/sec", string_buff, string_buff2);
 
+  
   /* Button row. */
   bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
   gtk_container_add(GTK_CONTAINER(main_vb), bbox);
-  gtk_widget_show(bbox);
 
   close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
   SIGNAL_CONNECT_OBJECT(close_bt, "clicked", gtk_widget_destroy, sum_open_w);
   gtk_widget_grab_default(close_bt);
+  gtk_widget_grab_focus(close_bt);
 
   /* Catch the "key_press_event" signal in the window, so that we can catch
      the ESC key being pressed and act as if the "Close" button had
@@ -288,5 +313,5 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_)
   dlg_set_cancel(sum_open_w, close_bt);
 
   gtk_window_set_position(GTK_WINDOW(sum_open_w), GTK_WIN_POS_MOUSE);
-  gtk_widget_show(sum_open_w);
+  gtk_widget_show_all(sum_open_w);
 }