add some more online help functionality and help buttons at various dialog boxes, if a help page *is* available. However, the new help system needs a lot more work before completed.

svn path=/trunk/; revision=13152

1 files changed, 24 insertions, 5 deletions

diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c
index c460d55a45..d1ae9785dc 100644
--- a/gtk/conversations_table.c
+++ b/gtk/conversations_table.c
@@ -48,13 +48,14 @@
 #include "image/clist_descend.xpm"
 #include "simple_dialog.h"
 #include "globals.h"
-#include "gtk/find_dlg.h"
+#include "find_dlg.h"
 #include "color.h"
 #include "gtk/color_dlg.h"
 #include "gtkglobals.h"
 #include "main.h"
 #include "ui_util.h"
 #include "dlg_utils.h"
+#include "help_dlg.h"
 
 
 #define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a))
@@ -1238,7 +1239,7 @@ init_conversation_table(gboolean hide_ports, char *table_name, char *tap_name, c
     char title[256];
     GtkWidget *vbox;
     GtkWidget *bbox;
-    GtkWidget *close_bt;
+    GtkWidget *close_bt, *help_bt;
     gboolean ret;
 
 
@@ -1261,12 +1262,21 @@ init_conversation_table(gboolean hide_ports, char *table_name, char *tap_name, c
     }
 
     /* Button row. */
-    bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
+    if(topic_available(HELP_STATS_CONVERSATIONS_DIALOG)) {
+        bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
+    } else {
+        bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
+    }
     gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
 
     close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
     window_set_cancel_button(conversations->win, close_bt, window_cancel_button_cb);
 
+    if(topic_available(HELP_STATS_CONVERSATIONS_DIALOG)) {
+        help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP);
+        SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_STATS_CONVERSATIONS_DIALOG);
+    }
+
     SIGNAL_CONNECT(conversations->win, "delete_event", window_delete_event_cb, NULL);
     SIGNAL_CONNECT(conversations->win, "destroy", ct_win_destroy_cb, conversations);
 
@@ -1385,7 +1395,7 @@ init_conversation_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
     GtkWidget *vbox;
     GtkWidget *hbox;
     GtkWidget *bbox;
-    GtkWidget *close_bt;
+    GtkWidget *close_bt, *help_bt;
     GtkWidget *win;
     GtkWidget *resolv_cb;
     int page;
@@ -1440,12 +1450,21 @@ init_conversation_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
     SIGNAL_CONNECT(resolv_cb, "toggled", ct_resolve_toggle_dest, pages);
 
     /* Button row. */
-    bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
+    if(topic_available(HELP_STATS_CONVERSATIONS_DIALOG)) {
+        bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
+    } else {
+        bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
+    }
     gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
 
     close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
     window_set_cancel_button(win, close_bt, window_cancel_button_cb);
 
+    if(topic_available(HELP_STATS_CONVERSATIONS_DIALOG)) {
+        help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP);
+        SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_STATS_CONVERSATIONS_DIALOG);
+    }
+
     SIGNAL_CONNECT(win, "delete_event", window_delete_event_cb, NULL);
     SIGNAL_CONNECT(win, "destroy", ct_win_destroy_notebook_cb, pages);