From 9f54eea55e455fa0d41218c68762529a12c21499 Mon Sep 17 00:00:00 2001
From: edgrif <edgrif>
Date: Thu, 4 Jan 2007 10:56:02 +0000
Subject: [PATCH] add website to the 'about dialog' and add mail addresses to
 authors text.

---
 src/include/ZMap/zmapUtils.h |  9 +++++----
 src/zmapUtils/zmapGUIutils.c | 10 ++++++----
 src/zmapUtils/zmapUtils.c    | 17 +++++++++++++++--
 src/zmapUtils/zmapUtils_P.h  |  9 +++++++--
 4 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/include/ZMap/zmapUtils.h b/src/include/ZMap/zmapUtils.h
index a71482aa6..923fb0dac 100755
--- a/src/include/ZMap/zmapUtils.h
+++ b/src/include/ZMap/zmapUtils.h
@@ -24,9 +24,9 @@
  *
  * Description: Utility functions for ZMap.
  * HISTORY:
- * Last edited: Nov  7 15:35 2006 (edgrif)
+ * Last edited: Jan  4 10:29 2007 (edgrif)
  * Created: Thu Feb 26 10:33:10 2004 (edgrif)
- * CVS info:   $Id: zmapUtils.h,v 1.25 2006-11-08 09:23:23 edgrif Exp $
+ * CVS info:   $Id: zmapUtils.h,v 1.26 2007-01-04 10:56:02 edgrif Exp $
  *-------------------------------------------------------------------
  */
 #ifndef ZMAP_UTILS_H
@@ -128,8 +128,9 @@ gboolean zMapFileEmpty(char *filepath) ;
 char *zMapGetAppName(void) ;
 char *zMapGetAppTitle(void) ;
 char *zMapGetCopyrightString(void) ;
-  char *zMapGetCommentsString(void) ;
-  char *zMapGetLicenseString(void) ;
+char *zMapGetWebSiteString(void) ;
+char *zMapGetCommentsString(void) ;
+char *zMapGetLicenseString(void) ;
 int zMapGetVersion(void) ;
 char *zMapGetVersionString(void) ;
 gboolean zMapCompareVersionStings(char *reference_version, char *test_version) ;
diff --git a/src/zmapUtils/zmapGUIutils.c b/src/zmapUtils/zmapGUIutils.c
index 2e8ce38ed..a282c1c7f 100755
--- a/src/zmapUtils/zmapGUIutils.c
+++ b/src/zmapUtils/zmapGUIutils.c
@@ -25,9 +25,9 @@
  * Description: 
  * Exported functions: See ZMap/zmapUtilsGUI.h
  * HISTORY:
- * Last edited: Dec 21 15:56 2006 (edgrif)
+ * Last edited: Jan  4 10:27 2007 (edgrif)
  * Created: Thu Jul 24 14:37:35 2003 (edgrif)
- * CVS info:   $Id: zmapGUIutils.c,v 1.25 2006-12-21 16:18:46 edgrif Exp $
+ * CVS info:   $Id: zmapGUIutils.c,v 1.26 2007-01-04 10:56:02 edgrif Exp $
  *-------------------------------------------------------------------
  */
 
@@ -162,7 +162,9 @@ void zMapGUIShowAbout(void)
 {
 #if GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 6
   GtkWidget *about_dialog ;
-  const gchar *authors[] = {"Ed Griffiths", "Roy Storey", NULL} ;
+  const gchar *authors[] = {"Ed Griffiths, Sanger Institute, UK <edgrif@sanger.ac.uk>",
+			    "Roy Storey Sanger Institute, UK <rds@sanger.ac.uk>",
+			    NULL} ;
 
   about_dialog = gtk_about_dialog_new() ;
 
@@ -176,7 +178,7 @@ void zMapGUIShowAbout(void)
 
   gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(about_dialog), zMapGetLicenseString()) ;
 
-  gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(about_dialog), "(website coming soon)") ;
+  gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(about_dialog), zMapGetWebSiteString()) ;
 
   gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(about_dialog), authors) ;
 
diff --git a/src/zmapUtils/zmapUtils.c b/src/zmapUtils/zmapUtils.c
index 919ffa35b..10dbb0eb9 100755
--- a/src/zmapUtils/zmapUtils.c
+++ b/src/zmapUtils/zmapUtils.c
@@ -26,9 +26,9 @@
  *              
  * Exported functions: See ZMap/zmapUtils.h
  * HISTORY:
- * Last edited: Nov  7 16:06 2006 (edgrif)
+ * Last edited: Jan  4 10:28 2007 (edgrif)
  * Created: Fri Mar 12 08:16:24 2004 (edgrif)
- * CVS info:   $Id: zmapUtils.c,v 1.19 2006-11-08 09:24:53 edgrif Exp $
+ * CVS info:   $Id: zmapUtils.c,v 1.20 2007-01-04 10:56:02 edgrif Exp $
  *-------------------------------------------------------------------
  */
 
@@ -196,6 +196,19 @@ char *zMapGetCopyrightString(void)
   return ZMAP_COPYRIGHT_STRING() ;
 }
 
+
+/*!
+ * Returns the ZMap website URL.
+ *
+ * @param void  None.
+ * @return      The website as a string.
+ *  */
+char *zMapGetWebSiteString(void)
+{
+  return ZMAP_WEBSITE_STRING() ;
+}
+
+
 /*!
  * Returns a comments string for the ZMap application.
  *
diff --git a/src/zmapUtils/zmapUtils_P.h b/src/zmapUtils/zmapUtils_P.h
index 170b53ef1..79c5fa15b 100755
--- a/src/zmapUtils/zmapUtils_P.h
+++ b/src/zmapUtils/zmapUtils_P.h
@@ -24,9 +24,9 @@
  *
  * Description: 
  * HISTORY:
- * Last edited: Oct 19 11:50 2006 (rds)
+ * Last edited: Jan  4 10:25 2007 (edgrif)
  * Created: Wed Mar 31 11:53:45 2004 (edgrif)
- * CVS info:   $Id: zmapUtils_P.h,v 1.54 2006-12-15 12:15:17 zmap Exp $
+ * CVS info:   $Id: zmapUtils_P.h,v 1.55 2007-01-04 10:56:02 edgrif Exp $
  *-------------------------------------------------------------------
  */
 #ifndef ZMAP_UTILS_P_H
@@ -64,6 +64,11 @@ TITLE " - " ZMAP_MAKE_VERSION_STRING(VERSION, RELEASE, UPDATE)
 "Copyright (c):   Sanger Institute, 2006"
 
 
+/* Create a website string for dialogs etc. */
+#define ZMAP_WEBSITE_STRING()                                  \
+"http://wwwdev.sanger.ac.uk/Software/analysis/ZMap/"
+
+
 /* Create a comments string for dialogs etc. */
 #define ZMAP_COMMENTS_STRING(TITLE, VERSION, RELEASE, UPDATE)                                  \
 "("ZMAP_MAKE_TITLE_STRING(TITLE, VERSION, RELEASE, UPDATE)", "              \
-- 
GitLab