Add help buttons to Certificate Viewer, PDM, print and print setup

2004-01-04  Piers Cornwell  <piers@myrealbox.com>

	* data/glade/certificate-dialogs.glade:
	* data/glade/epiphany.glade:
	* data/glade/print.glade:
	* embed/mozilla/GtkNSSDialogs.cpp:
	* embed/print-dialog.c: (ephy_print_dialog_response_cb),
	(ephy_print_setup_dialog_help_button_cb):
	* src/pdm-dialog.c: (pdm_dialog_show_help):
	* src/prefs-dialog.c: (prefs_dialog_show_help):

	Add help buttons to Certificate Viewer, PDM, print and print setup
	dialogues.

8 files changed, 126 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index cea72858d..edfe86877 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2004-01-04  Piers Cornwell  <piers@myrealbox.com>
+
+	* data/glade/certificate-dialogs.glade:
+	* data/glade/epiphany.glade:
+	* data/glade/print.glade:
+	* embed/mozilla/GtkNSSDialogs.cpp:
+	* embed/print-dialog.c: (ephy_print_dialog_response_cb),
+	(ephy_print_setup_dialog_help_button_cb):
+	* src/pdm-dialog.c: (pdm_dialog_show_help):
+	* src/prefs-dialog.c: (prefs_dialog_show_help):
+
+	Add help buttons to Certificate Viewer, PDM, print and print setup
+	dialogues.
+
 2004-01-04  Christian Persch  <chpe@cvs.gnome.org>
 
 	* src/ephy-window.c: (confirm_close_with_modified_forms):
diff --git a/data/glade/certificate-dialogs.glade b/data/glade/certificate-dialogs.glade
index 3ec493b1a..2e48092a5 100644
--- a/data/glade/certificate-dialogs.glade
+++ b/data/glade/certificate-dialogs.glade
@@ -12,6 +12,11 @@
   <property name="modal">True</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -34,9 +39,23 @@
 	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-7</property>
 	    </widget>
 	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="help_button">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-help</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-11</property>
+	    </widget>
+	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
@@ -175,7 +194,7 @@
 			  <child>
 			    <widget class="GtkLabel" id="label_size">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Common Name (CN):</property>
+			      <property name="label" translatable="yes">Common Name:</property>
 			      <property name="use_underline">False</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -199,7 +218,7 @@
 			  <child>
 			    <widget class="GtkLabel" id="label45">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Organization (O):</property>
+			      <property name="label" translatable="yes">Organization:</property>
 			      <property name="use_underline">False</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -223,7 +242,7 @@
 			  <child>
 			    <widget class="GtkLabel" id="label_size1">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Organizational Unit (OU):</property>
+			      <property name="label" translatable="yes">Organizational Unit:</property>
 			      <property name="use_underline">False</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -455,7 +474,7 @@
 			  <child>
 			    <widget class="GtkLabel" id="label41">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Common Name (CN):</property>
+			      <property name="label" translatable="yes">Common Name:</property>
 			      <property name="use_underline">False</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -479,7 +498,7 @@
 			  <child>
 			    <widget class="GtkLabel" id="label40">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Organization (O):</property>
+			      <property name="label" translatable="yes">Organization:</property>
 			      <property name="use_underline">False</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -578,7 +597,7 @@
 			  <child>
 			    <widget class="GtkLabel" id="label_size2">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Organizational Unit (OU):</property>
+			      <property name="label" translatable="yes">Organizational Unit:</property>
 			      <property name="use_underline">False</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1220,6 +1239,8 @@
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
 				  <property name="editable">False</property>
+				  <property name="overwrite">False</property>
+				  <property name="accepts_tab">True</property>
 				  <property name="justification">GTK_JUSTIFY_LEFT</property>
 				  <property name="wrap_mode">GTK_WRAP_CHAR</property>
 				  <property name="cursor_visible">False</property>
diff --git a/data/glade/epiphany.glade b/data/glade/epiphany.glade
index f1cbb4bd7..f4a488b42 100644
--- a/data/glade/epiphany.glade
+++ b/data/glade/epiphany.glade
@@ -732,6 +732,19 @@
 	      <property name="response_id">-7</property>
 	    </widget>
 	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="help_button">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-help</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-11</property>
+	    </widget>
+	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
diff --git a/data/glade/print.glade b/data/glade/print.glade
index 47cdfa2a4..72e41bdc5 100644
--- a/data/glade/print.glade
+++ b/data/glade/print.glade
@@ -44,6 +44,20 @@
 	      <signal name="clicked" handler="ephy_print_setup_dialog_close_button_cb" last_modification_time="Sat, 06 Dec 2003 10:22:18 GMT"/>
 	    </widget>
 	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="help_button">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-help</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-11</property>
+	      <signal name="clicked" handler="ephy_print_setup_dialog_help_button_cb" last_modification_time="Sun, 04 Jan 2004 20:17:34 GMT"/>
+	    </widget>
+	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
@@ -586,7 +600,7 @@
 			    <widget class="GtkCheckButton" id="print_page_url_checkbutton">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Page a_ddress</property>
+			      <property name="label" translatable="yes">_Page address</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
@@ -1147,6 +1161,19 @@
 	      <property name="response_id">-5</property>
 	    </widget>
 	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="help_button">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-help</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-11</property>
+	    </widget>
+	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index 94d8e9527..809ad9fd9 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -72,6 +72,7 @@
 
 #include "GtkNSSDialogs.h"
 #include "ephy-glade.h"
+#include "ephy-gui.h"
 
 #include <time.h>
 
@@ -1390,7 +1391,19 @@ GtkNSSDialogs::ViewCert(nsIInterfaceRequestor *ctx,
 	g_object_unref (gxml);
 
 	gtk_widget_show_all (dialog);
-	gtk_dialog_run (GTK_DIALOG (dialog));
+
+	int res;
+	while (1)
+	{
+		res = gtk_dialog_run (GTK_DIALOG (dialog));
+		if (res == GTK_RESPONSE_HELP)
+		{
+			ephy_gui_help (GTK_WINDOW (dialog), "epiphany", "using-certificate-viewer");
+			continue;
+		}  
+		break;
+	}
+
 	gtk_widget_destroy (dialog);
 	return NS_OK;
 }
diff --git a/embed/print-dialog.c b/embed/print-dialog.c
index 600e7a968..11c80ab1b 100755
--- a/embed/print-dialog.c
+++ b/embed/print-dialog.c
@@ -25,6 +25,7 @@
 #include "ephy-stock-icons.h"
 #include "eel-gconf-extensions.h"
 #include "ephy-debug.h"
+#include "ephy-gui.h"
 
 #include <gtk/gtkwindow.h>
 #include <gtk/gtkdialog.h>
@@ -131,6 +132,8 @@ void ephy_print_dialog_browse_button_cb		(GtkWidget *widget,
 						 EphyDialog *dialog);
 void ephy_print_setup_dialog_close_button_cb	(GtkWidget *widget,
 						 EphyDialog *dialog);
+void ephy_print_setup_dialog_help_button_cb	(GtkWidget *widget,
+						 EphyDialog *dialog);
 
 void
 ephy_print_info_free (EmbedPrintInfo *info)
@@ -222,16 +225,24 @@ ephy_print_dialog_response_cb (GtkWidget *widget,
 		return;
 	}
 
-	if (response == GTK_RESPONSE_OK)
+	switch (response)
 	{
-		info = ephy_print_get_print_info ();
+		case GTK_RESPONSE_OK:
+			info = ephy_print_get_print_info ();
 	
-		embed = ephy_embed_dialog_get_embed (EPHY_EMBED_DIALOG (dialog));
-		g_return_if_fail (EPHY_IS_EMBED (embed));
+			embed = ephy_embed_dialog_get_embed (EPHY_EMBED_DIALOG (dialog));
+			g_return_if_fail (EPHY_IS_EMBED (embed));
 	
-		ephy_embed_print (embed, info);
+			ephy_embed_print (embed, info);
 	
-		ephy_print_info_free (info);
+			ephy_print_info_free (info);
+
+			break;
+		case GTK_RESPONSE_HELP:
+			ephy_gui_help (GTK_WINDOW (dialog), "epiphany", "to-print-page");
+			return;
+		default:
+			break;
 	}
 
 	g_object_unref (dialog);
@@ -293,6 +304,13 @@ ephy_print_setup_dialog_close_button_cb (GtkWidget *widget,
 	g_object_unref (dialog);
 }
 
+void
+ephy_print_setup_dialog_help_button_cb (GtkWidget *widget,
+					 EphyDialog *dialog)
+{
+	ephy_gui_help (GTK_WINDOW (dialog), "epiphany", "using-print-setup");
+}
+
 EphyDialog *
 ephy_print_dialog_new (GtkWidget *parent,
 		       EphyEmbed *embed,
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index 4a1a2b118..7e56f80e0 100755
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -179,12 +179,9 @@ pdm_dialog_show_help (PdmDialog *pd)
 	GtkWidget *notebook, *window;
 	int id;
 
-	/* FIXME: Once we actually have documentation we
-	 * should point these at the correct links.
-	 */
 	char *help_preferences[] = {
-		"pdm",
-		"pdm"
+		"managing-cookies",
+		"managing-passwords"
 	};
 
 	window = ephy_dialog_get_control (EPHY_DIALOG (pd), properties[PROP_WINDOW].id);
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 06d5ea77a..f0efa27b2 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -407,14 +407,11 @@ prefs_dialog_show_help (EphyDialog *dialog)
 	GtkWidget *window, *notebook;
 	int id;
 
-	/* FIXME: Once we actually have documentation we
-	 * should point these at the correct links.
-	 */
 	char *help_preferences[] = {
-		"setting-preferences",
-		"setting-preferences",
-		"setting-preferences",
-		"setting-preferences"
+		"general-preferences",
+		"fonts-and-colors-preferences",
+		"privacy-preferences",
+		"language-preferences"
 	};
 
 	window = ephy_dialog_get_control (dialog, properties[WINDOW_PROP].id);