? profterm.diff
? help/C/gnome-terminal-C.omf.out
? src/gnome-terminal.glade2p
Index: src/gnome-terminal.glade2
===================================================================
RCS file: /cvs/gnome/profterm/src/gnome-terminal.glade2,v
retrieving revision 1.27
diff -u -r1.27 gnome-terminal.glade2
--- src/gnome-terminal.glade2	17 Jun 2002 13:36:10 -0000	1.27
+++ src/gnome-terminal.glade2	2 Jul 2002 12:08:36 -0000
@@ -342,7 +342,7 @@
 			<widget class="GtkCheckButton" id="blink-cursor-checkbutton">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Blink cursor</property>
+			  <property name="label" translatable="yes">Cursor _blinks</property>
 			  <property name="use_underline">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="active">False</property>
@@ -369,10 +369,10 @@
 		      <property name="yscale">1</property>
 
 		      <child>
-			<widget class="GtkCheckButton" id="silent-bell-checkbutton">
+			<widget class="GtkCheckButton" id="bell-checkbutton">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Silence terminal _bell</property>
+			  <property name="label" translatable="yes">Terminal _bell</property>
 			  <property name="use_underline">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="active">False</property>
@@ -705,8 +705,8 @@
 			  <property name="invisible_char" translatable="yes">*</property>
 			  <property name="activates_default">False</property>
 			  <accessibility>
-			    <atkrelation target="use-custom-command-checkbutton" type="controlled-by"/>
 			    <atkrelation target="custom-command-entry-label" type="labelled-by"/>
+			    <atkrelation target="use-custom-command-checkbutton" type="controlled-by"/>
 			  </accessibility>
 			</widget>
 			<packing>
@@ -2684,7 +2684,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label59">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">A_ccelerators:</property>
+	      <property name="label" translatable="yes">_Accelerators:</property>
 	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
Index: src/profile-editor.c
===================================================================
RCS file: /cvs/gnome/profterm/src/profile-editor.c,v
retrieving revision 1.34
diff -u -r1.34 profile-editor.c
--- src/profile-editor.c	17 Jun 2002 13:36:10 -0000	1.34
+++ src/profile-editor.c	2 Jul 2002 12:08:36 -0000
@@ -478,11 +478,11 @@
 }
 
 static void
-silent_bell_toggled (GtkWidget       *checkbutton,
-                     TerminalProfile *profile)
+bell_toggled (GtkWidget       *checkbutton,
+              TerminalProfile *profile)
 {
   terminal_profile_set_silent_bell (profile,
-                                    gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton)));
+                                    !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton)));
 }
 
 static void
@@ -1074,10 +1074,10 @@
                         G_CALLBACK (allow_bold_toggled),
                         profile);
       
-      w = glade_xml_get_widget (xml, "silent-bell-checkbutton");
+      w = glade_xml_get_widget (xml, "bell-checkbutton");
       profile_editor_update_silent_bell (editor, profile);
       g_signal_connect (G_OBJECT (w), "toggled",
-                        G_CALLBACK (silent_bell_toggled),
+                        G_CALLBACK (bell_toggled),
                         profile);
 
       w = glade_xml_get_widget (xml, "word-chars-entry");
@@ -1435,7 +1435,7 @@
   set_insensitive (editor, "allow-bold-checkbutton",
                    mask & TERMINAL_SETTING_ALLOW_BOLD);
 
-  set_insensitive (editor, "silent-bell-checkbutton",
+  set_insensitive (editor, "bell-checkbutton",
                    mask & TERMINAL_SETTING_SILENT_BELL);
 
   set_insensitive (editor, "word-chars-entry",
@@ -1661,7 +1661,7 @@
 {
   GtkWidget *w;
 
-  w = profile_editor_get_widget (editor, "silent-bell-checkbutton");
+  w = profile_editor_get_widget (editor, "bell-checkbutton");
   
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w),
                                 terminal_profile_get_silent_bell (profile));
Index: src/terminal-accels.h
===================================================================
RCS file: /cvs/gnome/profterm/src/terminal-accels.h,v
retrieving revision 1.7
diff -u -r1.7 terminal-accels.h
--- src/terminal-accels.h	18 Mar 2002 02:47:28 -0000	1.7
+++ src/terminal-accels.h	2 Jul 2002 12:08:37 -0000
@@ -43,6 +43,7 @@
 #define ACCEL_PATH_PREV_TAB ACCEL_PATH_ROOT"/prev_tab"
 #define ACCEL_PATH_NEXT_TAB ACCEL_PATH_ROOT"/next_tab"
 #define ACCEL_PATH_SET_TERMINAL_TITLE ACCEL_PATH_ROOT"/set_terminal_title"
+#define ACCEL_PATH_HELP ACCEL_PATH_ROOT"/help"
 
 #define FORMAT_ACCEL_PATH_SWITCH_TO_TAB ACCEL_PATH_ROOT"/switch_to_tab_%d"
 #define PREFIX_ACCEL_PATH_SWITCH_TO_TAB ACCEL_PATH_ROOT"/switch_to_tab_"
Index: src/terminal-window.c
===================================================================
RCS file: /cvs/gnome/profterm/src/terminal-window.c,v
retrieving revision 1.54
diff -u -r1.54 terminal-window.c
--- src/terminal-window.c	27 May 2002 08:10:11 -0000	1.54
+++ src/terminal-window.c	2 Jul 2002 12:08:37 -0000
@@ -31,6 +31,7 @@
 #include <libgnomeui/gnome-about.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <gdk/gdkx.h>
+#include <gdk/gdkkeysyms.h>
 #include <eel/eel-ellipsizing-label.h>
 
 struct _TerminalWindowPrivate
@@ -46,6 +47,7 @@
   GtkWidget *help_menuitem;
   GtkWidget *new_window_menuitem;
   GtkWidget *new_tab_menuitem;
+  GtkWidget *close_tab_menuitem;
   GtkWidget *copy_menuitem;
   GtkWidget *paste_menuitem;
   GtkWidget *fullscreen_menuitem;
@@ -543,9 +545,10 @@
                    G_CALLBACK (close_window_callback),
                    window);
   
-  append_menuitem (menu, _("C_lose Tab"), ACCEL_PATH_CLOSE_TAB,
-                   G_CALLBACK (close_tab_callback),
-                   window);
+  window->priv->close_tab_menuitem = 
+    append_menuitem (menu, _("C_lose Tab"), ACCEL_PATH_CLOSE_TAB,
+                     G_CALLBACK (close_tab_callback),
+                     window);
   
   mi = append_menuitem (window->priv->menubar,
                         "", NULL,
@@ -656,11 +659,16 @@
 
   mi = append_stock_menuitem (menu, GTK_STOCK_HELP, NULL,
 			      G_CALLBACK (help_callback), window);
-  set_menuitem_text (mi, _("_Help Contents"), FALSE);
+  set_menuitem_text (mi, _("_Contents"), FALSE);
+
+  gtk_accel_map_add_entry (ACCEL_PATH_HELP, GDK_F1, 0);
+  gtk_menu_item_set_accel_path (GTK_MENU_ITEM (mi),
+                                ACCEL_PATH_HELP);
+
   
   mi = append_stock_menuitem (menu, GNOME_STOCK_ABOUT, NULL,
                               G_CALLBACK (about_callback), window);
-  set_menuitem_text (mi, _("_About GNOME Terminal"),
+  set_menuitem_text (mi, _("_About"),
                      FALSE);
 
   terminal_window_reread_profile_list (window);
@@ -857,11 +865,17 @@
   gtk_widget_set_sensitive (window->priv->previous_tab_menuitem,
                             page_num > 0);
 
+
   /* FIXME
    * http://bugzilla.gnome.org/show_bug.cgi?id=73229
    */
   on_last_page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook),
                                             page_num + 1) == NULL;
+  
+  if (page_num == 0 && on_last_page)
+    gtk_widget_set_sensitive (window->priv->close_tab_menuitem, FALSE);
+  else
+    gtk_widget_set_sensitive (window->priv->close_tab_menuitem, TRUE);
   
   gtk_widget_set_sensitive (window->priv->next_tab_menuitem,
                             !on_last_page);
Index: src/terminal.c
===================================================================
RCS file: /cvs/gnome/profterm/src/terminal.c,v
retrieving revision 1.39
diff -u -r1.39 terminal.c
--- src/terminal.c	17 Jun 2002 13:36:10 -0000	1.39
+++ src/terminal.c	2 Jul 2002 12:08:37 -0000
@@ -79,6 +79,7 @@
 static TerminalApp *app = NULL;
 static gboolean terminal_factory_disabled = FALSE;
 
+#define TERMINAL_STOCK_EDIT "terminal-edit"
 typedef struct
 {
   GList *initial_windows;
@@ -1687,7 +1688,7 @@
       old_transient_parent = NULL;      
       
       app->new_profile_dialog =
-        gtk_dialog_new_with_buttons (_("New terminal profile"),
+        gtk_dialog_new_with_buttons (_("New Profile"),
                                      NULL,
                                      GTK_DIALOG_DESTROY_WITH_PARENT,
                                      GTK_STOCK_CANCEL,
@@ -1717,7 +1718,7 @@
       
       hbox = gtk_hbox_new (FALSE, PADDING);
 
-      label = gtk_label_new_with_mnemonic (_("Profile _Name:"));
+      label = gtk_label_new_with_mnemonic (_("Profile _name:"));
       gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
       entry = gtk_entry_new ();
       app->new_profile_name_entry = entry;
@@ -1736,7 +1737,7 @@
       
       hbox = gtk_hbox_new (FALSE, PADDING);
 
-      label = gtk_label_new_with_mnemonic (_("_Base new profile on:"));
+      label = gtk_label_new_with_mnemonic (_("_Base on:"));
       gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
       app->new_profile_base_menu = profile_optionmenu_new ();
       option_menu = app->new_profile_base_menu;
@@ -2028,19 +2029,19 @@
                                    GTK_BUTTONS_NONE,
                                    "%s", 
                                    str->str);
-
   g_string_free (str, TRUE);
 
   gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-                          _("_No"),
+                          GTK_STOCK_CANCEL,
                           GTK_RESPONSE_REJECT,
-                          _("_Delete"),
+			  GTK_STOCK_DELETE,
                           GTK_RESPONSE_ACCEPT,
                           NULL);
 
   gtk_dialog_set_default_response (GTK_DIALOG (dialog),
-                                   GTK_RESPONSE_REJECT);
-  
+                                   GTK_RESPONSE_ACCEPT);
+ 
+  gtk_window_set_title (GTK_WINDOW (dialog), _("Delete Profile")); 
   gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 
   g_object_set_data_full (G_OBJECT (dialog), "deleted-profiles-list",
@@ -2283,6 +2284,29 @@
     }
 }
 
+static void
+terminal_app_register_stock (void)
+{
+  static gboolean registered = FALSE;
+
+  if (!registered)
+    {
+      GtkIconFactory *factory;
+      GtkIconSet     *icons;
+
+      static GtkStockItem edit_item [] = {
+	{ TERMINAL_STOCK_EDIT, N_("_Edit"), 0, 0, GETTEXT_PACKAGE },
+      };
+
+      icons = gtk_icon_factory_lookup_default (GTK_STOCK_PREFERENCES);
+      factory = gtk_icon_factory_new ();
+      gtk_icon_factory_add (factory, TERMINAL_STOCK_EDIT, icons);
+      gtk_icon_factory_add_default (factory);
+      gtk_stock_add_static (edit_item, 1);
+      registered = TRUE;
+    }
+}
+
 void
 terminal_app_manage_profiles (TerminalApp     *app,
                               GtkWindow       *transient_parent)
@@ -2304,7 +2328,7 @@
       old_transient_parent = NULL;      
       
       app->manage_profiles_dialog =
-        gtk_dialog_new_with_buttons (_("Manage terminal profiles"),
+        gtk_dialog_new_with_buttons (_("Edit Profiles"),
                                      NULL,
                                      GTK_DIALOG_DESTROY_WITH_PARENT,
                                      GTK_STOCK_HELP,
@@ -2407,7 +2431,7 @@
       gtk_box_pack_start (GTK_BOX (vbox),
                           spacer, FALSE, FALSE, 0);
       
-      button = gtk_button_new_from_stock (_("_New..."));
+      button = gtk_button_new_from_stock (GTK_STOCK_NEW);
       fix_button_align (button);
       gtk_box_pack_start (GTK_BOX (vbox),
                           button, FALSE, FALSE, 0);
@@ -2417,8 +2441,10 @@
       terminal_util_set_atk_name_description (app->manage_profiles_new_button, NULL,                             
                                               _("Click to open new profile dialog"));
 
+
+      terminal_app_register_stock ();
       
-      button = gtk_button_new_with_mnemonic (_("_Edit..."));
+      button = gtk_button_new_from_stock (TERMINAL_STOCK_EDIT);
       fix_button_align (button);
       gtk_box_pack_start (GTK_BOX (vbox),
                           button, FALSE, FALSE, 0);
@@ -2428,7 +2454,7 @@
       terminal_util_set_atk_name_description (app->manage_profiles_edit_button, NULL,                            
                                               _("Click to open edit profile dialog"));
       
-      button = gtk_button_new_with_mnemonic (_("_Delete..."));
+      button = gtk_button_new_from_stock (GTK_STOCK_DELETE);
       fix_button_align (button);
       gtk_box_pack_start (GTK_BOX (vbox),
                           button, FALSE, FALSE, 0);
