Put "..." after menu items that will cause a dialog box to be popped up

(standard convention in many GUIs).

Make "Save as" be "Save As", and make "A" be the menu mnemonic for it in
the "File" menu, with GTK 1.2.

svn path=/trunk/; revision=315

3 files changed, 41 insertions, 41 deletions

diff --git a/ethereal.c b/ethereal.c
index 6bec69a29e..1403a21ae0 100644
--- a/ethereal.c
+++ b/ethereal.c
@@ -1,6 +1,6 @@
 /* ethereal.c
  *
- * $Id: ethereal.c,v 1.40 1999/06/15 03:46:46 guy Exp $
+ * $Id: ethereal.c,v 1.41 1999/06/15 04:48:56 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -166,10 +166,10 @@ file_sel_ok_cb(GtkWidget *w, GtkFileSelection *fs) {
   g_free(cf_name);
 #ifdef USE_ITEM
     set_menu_sensitivity("/File/Save", FALSE);
-    set_menu_sensitivity("/File/Save as", TRUE);
+    set_menu_sensitivity("/File/Save As...", TRUE);
 #else
     set_menu_sensitivity("<Main>/File/Save", FALSE);
-    set_menu_sensitivity("<Main>/File/Save as", TRUE);
+    set_menu_sensitivity("<Main>/File/Save As...", TRUE);
 #endif
 }
 
@@ -389,10 +389,10 @@ file_save_ok_cb(GtkWidget *w, GtkFileSelection *fs) {
 
 #ifdef USE_ITEM
 	set_menu_sensitivity("/File/Save", FALSE);
-	set_menu_sensitivity("/File/Save as", TRUE);
+	set_menu_sensitivity("/File/Save As...", TRUE);
 #else
 	set_menu_sensitivity("<Main>/File/Save", FALSE);
-	set_menu_sensitivity("<Main>/File/Save as", TRUE);
+	set_menu_sensitivity("<Main>/File/Save As...", TRUE);
 #endif
 }
 
@@ -418,10 +418,10 @@ file_save_as_ok_cb(GtkWidget *w, GtkFileSelection *fs) {
 
 #ifdef USE_ITEM
 	set_menu_sensitivity("/File/Save", FALSE);
-	set_menu_sensitivity("/File/Save as", TRUE);
+	set_menu_sensitivity("/File/Save As...", TRUE);
 #else
 	set_menu_sensitivity("<Main>/File/Save", FALSE);
-	set_menu_sensitivity("<Main>/File/Save as", TRUE);
+	set_menu_sensitivity("<Main>/File/Save As...", TRUE);
 #endif
 }
 
@@ -900,12 +900,12 @@ main(int argc, char *argv[])
   gtk_widget_show(filter_te);
 
 #ifdef USE_ITEM
-  set_menu_object_data("/File/Open", E_DFILTER_TE_KEY, filter_te);
+  set_menu_object_data("/File/Open...", E_DFILTER_TE_KEY, filter_te);
   set_menu_object_data("/File/Reload", E_DFILTER_TE_KEY, filter_te);
   set_menu_object_data("/Tools/Follow TCP Stream", E_DFILTER_TE_KEY,
     filter_te);
 #else
-  set_menu_object_data("<Main>/File/Open", E_DFILTER_TE_KEY, filter_te);
+  set_menu_object_data("<Main>/File/Open...", E_DFILTER_TE_KEY, filter_te);
   set_menu_object_data("<Main>/File/Reload", E_DFILTER_TE_KEY, filter_te);
   set_menu_object_data("<Main>/Tools/Follow TCP Stream", E_DFILTER_TE_KEY,
     filter_te);
@@ -939,9 +939,9 @@ main(int argc, char *argv[])
     }
     cf_name[0] = '\0';
 #ifdef USE_ITEM
-    set_menu_sensitivity("/File/Save as", TRUE);
+    set_menu_sensitivity("/File/Save As...", TRUE);
 #else
-    set_menu_sensitivity("<Main>/File/Save as", TRUE);
+    set_menu_sensitivity("<Main>/File/Save As...", TRUE);
 #endif
   }
 
diff --git a/file.c b/file.c
index 9ff600f27e..49c5bf3b65 100644
--- a/file.c
+++ b/file.c
@@ -1,7 +1,7 @@
 /* file.c
  * File I/O routines
  *
- * $Id: file.c,v 1.27 1999/06/14 21:46:36 guy Exp $
+ * $Id: file.c,v 1.28 1999/06/15 04:48:57 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -317,12 +317,12 @@ load_cap_file(char *fname, capture_file *cf) {
 #ifdef USE_ITEM
     set_menu_sensitivity("/File/Close", FALSE);
     set_menu_sensitivity("/File/Save", FALSE);
-    set_menu_sensitivity("/File/Save as", FALSE);
+    set_menu_sensitivity("/File/Save As...", FALSE);
     set_menu_sensitivity("/File/Reload", FALSE);
 #else
     set_menu_sensitivity("<Main>/File/Close", FALSE);
     set_menu_sensitivity("<Main>/File/Save", FALSE);
-    set_menu_sensitivity("<Main>/File/Save as", FALSE);
+    set_menu_sensitivity("<Main>/File/Save As...", FALSE);
     set_menu_sensitivity("<Main>/File/Reload", FALSE);
 #endif
   }
@@ -359,17 +359,17 @@ cap_file_input_cb (gpointer data, gint source, GdkInputCondition condition) {
 #endif
     cf->plist = g_list_first(cf->plist);
 #ifdef USE_ITEM
-    set_menu_sensitivity("/File/Open", TRUE);
+    set_menu_sensitivity("/File/Open...", TRUE);
     set_menu_sensitivity("/File/Close", TRUE);
-    set_menu_sensitivity("/File/Save as", TRUE);
+    set_menu_sensitivity("/File/Save As...", TRUE);
     set_menu_sensitivity("/File/Reload", TRUE);
-    set_menu_sensitivity("/Tools/Capture", TRUE);
+    set_menu_sensitivity("/Tools/Capture...", TRUE);
 #else
-    set_menu_sensitivity("<Main>/File/Open", TRUE);
+    set_menu_sensitivity("<Main>/File/Open...", TRUE);
     set_menu_sensitivity("<Main>/File/Close", TRUE);
-    set_menu_sensitivity("<Main>/File/Save as", TRUE);
+    set_menu_sensitivity("<Main>/File/Save As...", TRUE);
     set_menu_sensitivity("<Main>/File/Reload", TRUE);
-    set_menu_sensitivity("<Main>/Tools/Capture", TRUE);
+    set_menu_sensitivity("<Main>/Tools/Capture...", TRUE);
 #endif
     gtk_statusbar_push(GTK_STATUSBAR(info_bar), file_ctx, " File: <none>");
     return;
@@ -439,15 +439,15 @@ tail_cap_file(char *fname, capture_file *cf) {
 #endif
 
 #ifdef USE_ITEM
-    set_menu_sensitivity("/File/Open", FALSE);
+    set_menu_sensitivity("/File/Open...", FALSE);
     set_menu_sensitivity("/File/Close", FALSE);
     set_menu_sensitivity("/File/Reload", FALSE);
-    set_menu_sensitivity("/Tools/Capture", FALSE);
+    set_menu_sensitivity("/Tools/Capture...", FALSE);
 #else
-    set_menu_sensitivity("<Main>/File/Open", FALSE);
+    set_menu_sensitivity("<Main>/File/Open...", FALSE);
     set_menu_sensitivity("<Main>/File/Close", FALSE);
     set_menu_sensitivity("<Main>/File/Reload", FALSE);
-    set_menu_sensitivity("<Main>/Tools/Capture", FALSE);
+    set_menu_sensitivity("<Main>/Tools/Capture...", FALSE);
 #endif
     cf->fh = fopen(fname, "r");
     tail_timeout_id = -1;
@@ -464,12 +464,12 @@ tail_cap_file(char *fname, capture_file *cf) {
 #ifdef USE_ITEM
     set_menu_sensitivity("/File/Close", FALSE);
     set_menu_sensitivity("/File/Save", FALSE);
-    set_menu_sensitivity("/File/Save as", FALSE);
+    set_menu_sensitivity("/File/Save As...", FALSE);
     set_menu_sensitivity("/File/Reload", FALSE);
 #else
     set_menu_sensitivity("<Main>/File/Close", FALSE);
     set_menu_sensitivity("<Main>/File/Save", FALSE);
-    set_menu_sensitivity("<Main>/File/Save as", FALSE);
+    set_menu_sensitivity("<Main>/File/Save As...", FALSE);
     set_menu_sensitivity("<Main>/File/Reload", FALSE);
 #endif
     close(sync_pipe[0]);
diff --git a/menu.c b/menu.c
index d93e480603..c8f50f47aa 100644
--- a/menu.c
+++ b/menu.c
@@ -1,7 +1,7 @@
 /* menu.c
  * Menu routines
  *
- * $Id: menu.c,v 1.18 1999/06/12 06:22:47 guy Exp $
+ * $Id: menu.c,v 1.19 1999/06/15 04:48:57 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -76,10 +76,10 @@ GtkAccelGroup *grp;
 static GtkItemFactoryEntry menu_items[] =
 {
   {"/_File", NULL, NULL, 0, "<Branch>" },
-  {"/File/_Open", "<control>O", GTK_MENU_FUNC(file_open_cmd_cb), 0, NULL},
+  {"/File/_Open...", "<control>O", GTK_MENU_FUNC(file_open_cmd_cb), 0, NULL},
   {"/File/_Close", "<control>W", GTK_MENU_FUNC(file_close_cmd_cb), 0, NULL},
   {"/File/_Save", "<control>S", GTK_MENU_FUNC(file_save_cmd_cb), 0, NULL},
-  {"/File/Save as", NULL, GTK_MENU_FUNC(file_save_as_cmd_cb), 0, NULL},
+  {"/File/Save _As...", NULL, GTK_MENU_FUNC(file_save_as_cmd_cb), 0, NULL},
   {"/File/_Reload", "<control>R", GTK_MENU_FUNC(file_reload_cmd_cb), 0, NULL},
   {"/File/<separator>", NULL, NULL, 0, "<Separator>"},
   {"/File/_Print Packet", "<control>P", GTK_MENU_FUNC(file_print_cmd_cb), 0, NULL},
@@ -92,13 +92,13 @@ static GtkItemFactoryEntry menu_items[] =
   {"/Edit/<separator>", NULL, NULL, 0, "<Separator>"},
   {"/Edit/Find", "<control>F", NULL, 0, NULL},
   {"/Edit/<separator>", NULL, NULL, 0, "<Separator>"},
-  {"/Edit/_Preferences", NULL, GTK_MENU_FUNC(prefs_cb), E_PR_PG_NONE, NULL},
+  {"/Edit/_Preferences...", NULL, GTK_MENU_FUNC(prefs_cb), E_PR_PG_NONE, NULL},
   {"/_Tools", NULL, NULL, 0, "<Branch>" },
-  {"/Tools/_Capture", "<control>K", GTK_MENU_FUNC(capture_prep_cb), 0, NULL},
+  {"/Tools/_Capture...", "<control>K", GTK_MENU_FUNC(capture_prep_cb), 0, NULL},
   {"/Tools/_Follow TCP Stream", NULL, GTK_MENU_FUNC(follow_stream_cb), 0, NULL},
   {"/Tools/Graph", NULL, NULL, 0, NULL},
   {"/_Help", NULL, NULL, 0, "<LastBranch>" },
-  {"/Help/_About Ethereal", NULL, GTK_MENU_FUNC(about_ethereal), 0, NULL}
+  {"/Help/_About Ethereal...", NULL, GTK_MENU_FUNC(about_ethereal), 0, NULL}
 };
 #else
 /* this is the GtkMenuEntry structure used to create new menus.  The
@@ -110,10 +110,10 @@ static GtkItemFactoryEntry menu_items[] =
  */
 static GtkMenuEntry menu_items[] =
 {
-  {"<Main>/File/Open", "<control>O", file_open_cmd_cb, NULL},
+  {"<Main>/File/Open...", "<control>O", file_open_cmd_cb, NULL},
   {"<Main>/File/Close", "<control>W", file_close_cmd_cb, NULL},
   {"<Main>/File/Save", "<control>S", file_save_cmd_cb, NULL},
-  {"<Main>/File/Save as", NULL, file_save_as_cmd_cb, NULL},
+  {"<Main>/File/Save As...", NULL, file_save_as_cmd_cb, NULL},
   {"<Main>/File/Reload", "<control>R", file_reload_cmd_cb, NULL},
   {"<Main>/File/<separator>", NULL, NULL, NULL},
   {"<Main>/File/Print Packet", "<control>P", file_print_cmd_cb, NULL},
@@ -125,11 +125,11 @@ static GtkMenuEntry menu_items[] =
   {"<Main>/Edit/<separator>", NULL, NULL, NULL},
   {"<Main>/Edit/Find", "<control>F", NULL, NULL},
   {"<Main>/Edit/<separator>", NULL, NULL, NULL},
-  {"<Main>/Edit/Preferences", NULL, prefs_cb, (gpointer) E_PR_PG_NONE},
-  {"<Main>/Tools/Capture", "<control>K", capture_prep_cb, NULL},
+  {"<Main>/Edit/Preferences...", NULL, prefs_cb, (gpointer) E_PR_PG_NONE},
+  {"<Main>/Tools/Capture...", "<control>K", capture_prep_cb, NULL},
   {"<Main>/Tools/Follow TCP Stream", NULL, follow_stream_cb, NULL},
   {"<Main>/Tools/Graph", NULL, NULL, NULL},
-  {"<Main>/Help/About Ethereal", NULL, about_ethereal, NULL}
+  {"<Main>/Help/About Ethereal...", NULL, about_ethereal, NULL}
 };
 #endif
 
@@ -193,7 +193,7 @@ menus_init(void) {
     gtk_item_factory_create_items_ac(factory, nmenu_items, menu_items, NULL,2);
     set_menu_sensitivity("/File/Close", FALSE);
     set_menu_sensitivity("/File/Save", FALSE);
-    set_menu_sensitivity("/File/Save as", FALSE);
+    set_menu_sensitivity("/File/Save As...", FALSE);
     set_menu_sensitivity("/File/Reload", FALSE);
     set_menu_sensitivity("/Edit/Cut", FALSE);
     set_menu_sensitivity("/Edit/Copy", FALSE);
@@ -201,7 +201,7 @@ menus_init(void) {
     set_menu_sensitivity("/Edit/Find", FALSE);
     set_menu_sensitivity("/Tools/Graph", FALSE);
 #ifdef WITH_WIRETAP
-	set_menu_sensitivity("/Tools/Follow TCP Stream", FALSE);
+    set_menu_sensitivity("/Tools/Follow TCP Stream", FALSE);
 #endif
     
 #else
@@ -213,7 +213,7 @@ menus_init(void) {
 
     set_menu_sensitivity("<Main>/File/Close", FALSE);
     set_menu_sensitivity("<Main>/File/Save", FALSE);
-    set_menu_sensitivity("<Main>/File/Save as", FALSE);
+    set_menu_sensitivity("<Main>/File/Save As...", FALSE);
     set_menu_sensitivity("<Main>/File/Reload", FALSE);
     set_menu_sensitivity("<Main>/Edit/Cut", FALSE);
     set_menu_sensitivity("<Main>/Edit/Copy", FALSE);
@@ -221,7 +221,7 @@ menus_init(void) {
     set_menu_sensitivity("<Main>/Edit/Find", FALSE);
     set_menu_sensitivity("<Main>/Tools/Graph", FALSE);
 #ifdef WITH_WIRETAP
-	set_menu_sensitivity("<Main>/Tools/Follow TCP Stream", FALSE);
+    set_menu_sensitivity("<Main>/Tools/Follow TCP Stream", FALSE);
 #endif
     if ((mp = gtk_menu_factory_find(factory, "<Main>/Help")) != NULL) {
       gtk_menu_item_right_justify((GtkMenuItem *) mp->widget);