]> Creatis software - bbtk.git/commitdiff
git://git.creatis.insa-lyon.fr / bbtk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4f58c18)
*** empty log message ***
authorguigues <guigues>
Wed, 15 Oct 2008 09:31:15 +0000 (09:31 +0000)
committerguigues <guigues>
Wed, 15 Oct 2008 09:31:15 +0000 (09:31 +0000)
kernel/doc/CMakeLists.txt patch | blob | history
kernel/doc/bbtkWebSite/help_contents.html [deleted file] patch | blob | history
kernel/doc/help_contents.html.in [new file with mode: 0644] patch | blob
kernel/src/bbtkWxGUIHtmlBrowser.cxx patch | blob | history

diff --git a/kernel/doc/CMakeLists.txt b/kernel/doc/CMakeLists.txt
index 862a44e6858013ec476129ac102a2a8e786bc27c..6d51cf8afe2f2c2f31097936b06ac325fe59d9fa 100755 (executable)
--- a/kernel/doc/CMakeLists.txt
+++ b/kernel/doc/CMakeLists.txt
@@ -63,6 +63,17 @@ IF(BUILD_BBTK_DOC)
     FILES ${BBTK_DOC_BUILD_PATH}/index-no-frame.html 
     DESTINATION ${BBTK_DOC_INSTALL_PATH}
     ) 
+  # Configure help_contents.html for build tree
+   CONFIGURE_FILE(
+    help_contents.html.in
+    ${BBTK_DOC_BUILD_PATH}/help_contents.html
+    @ONLY
+    )
+  # Install it 
+  INSTALL( 
+    FILES ${BBTK_DOC_BUILD_PATH}/help_contents.html
+    DESTINATION ${BBTK_DOC_INSTALL_PATH}
+    ) 
 
   # Recurse it bbtkWebSite dir
   SUBDIRS(bbtkWebSite)
diff --git a/kernel/doc/bbtkWebSite/help_contents.html b/kernel/doc/bbtkWebSite/help_contents.html
deleted file mode 100644 (file)
index e8f2c32..0000000
--- a/kernel/doc/bbtkWebSite/help_contents.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>Help Contents</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<H1>Help Contents</H1>
-
-<a href="../bbdoc/index-category.html#demo">Demos</a><br>
-<a href="../bbdoc/index-category.html#example">Examples</a>
-
-<H2>Guides</H2>
-
-<a href="../bbtkUsersGuide/bbtkUsersGuide.html" target="information">User's Guide</a><br>
-<a href="../bbtkPackageDevelopersGuide/bbtkPackageDevelopersGuide.html" target="information">Package Developer's Guide</a><br>
-<a href="../bbtkDevelopersGuide/bbtkDevelopersGuide.html" target="information">Developer's Guide</a><br>
-<a href="../bbtkReferenceManual/bbtkReferenceManual.html" target="information">Reference Manual</a> (to be written)<br>
-<a href="../doxygen/bbtk/main.html" target="information">bbtk library doxygen doc</a><br>
-
-<H2>Boxes</H2>
-
-<a target="information" href="../bbdoc/index-alpha.html">Alphabetical list</a><br>
-<a target="information" href="../bbdoc/index-package.html">List by package</a><br>
-<a target="information" href="../bbdoc/index-category.html">List by category</a><br>
-<a target="information" href="../bbdoc/index-adaptors.html">List of adaptors</a><br>
-
-</body>
-</html>
diff --git a/kernel/doc/help_contents.html.in b/kernel/doc/help_contents.html.in
new file mode 100644 (file)
index 0000000..4138f8f
--- /dev/null
+++ b/kernel/doc/help_contents.html.in
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <title>Help Contents - bbtk @BBTK_VERSION@ </title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<H1>Help Contents - bbtk @BBTK_VERSION@ </H1>
+
+<a href="bbdoc/index-category.html#demo">Demos</a><br>
+<a href="bbdoc/index-category.html#example">Examples</a>
+
+<H2>Guides</H2>
+
+<a href="bbtkUsersGuide/bbtkUsersGuide.html" target="information">User's Guide</a><br>
+<a href="bbtkPackageDevelopersGuide/bbtkPackageDevelopersGuide.html" target="information">Package Developer's Guide</a><br>
+<a href="bbtkDevelopersGuide/bbtkDevelopersGuide.html" target="information">Developer's Guide</a><br>
+<a href="bbtkReferenceManual/bbtkReferenceManual.html" target="information">Reference Manual</a> (to be written)<br>
+<a href="doxygen/bbtk/main.html" target="information">bbtk library doxygen doc</a><br>
+
+<H2>Boxes</H2>
+
+<a target="information" href="bbdoc/index-alpha.html">Alphabetical list</a><br>
+<a target="information" href="bbdoc/index-package.html">List by package</a><br>
+<a target="information" href="bbdoc/index-category.html">List by category</a><br>
+<a target="information" href="bbdoc/index-adaptors.html">List of adaptors</a><br>
+
+</body>
+</html> 
+ 
diff --git a/kernel/src/bbtkWxGUIHtmlBrowser.cxx b/kernel/src/bbtkWxGUIHtmlBrowser.cxx
index 76f3e9b448d1135297009d959774d00c12173553..df91b754af2957265758b386adb723e4a12385c5 100644 (file)
--- a/kernel/src/bbtkWxGUIHtmlBrowser.cxx
+++ b/kernel/src/bbtkWxGUIHtmlBrowser.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIHtmlBrowser.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/08 13:39:33 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2008/10/15 09:31:20 $
+  Version:   $Revision: 1.9 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -219,23 +219,8 @@ namespace bbtk
   void WxGUIHtmlBrowser::GoHome()
   {
     std::string url = ConfigurationFile::GetInstance().Get_doc_path();
-    url += "/bbtkWebSite/help_contents.html";
-       GoTo(url);
-
-    mwxURL->Clear();
-    mwxURL->AppendText(std2wx(url));
-
-
-/*EED
-    if (Utilities::FileExists(url)) 
-      {
-       GoTo(url);
-      }
-    else 
-      {
-       // what ?
-      }
-*/
+    url += "/help_contents.html";
+    GoTo(url);
   }
   //========================================================================
 
@@ -319,7 +304,10 @@ namespace bbtk
       {
        mwxHtmlWindow->LoadPage( e.GetLinkInfo().GetHref() );
        UpdateURL();
-      }
+       //      OnURLEnter(e);
+       //      mwxHtmlWindow->LoadPage(mwxURL->GetValue());
+     }
+
     //    mwxHtmlWindow->LoadPage( mwxURL->GetValue() );
    }
   //========================================================================
Black Box Tool Kit