Redirection

From cbb1d0fcc41f6d98f3057a117d84aaab0e6e4377 Mon Sep 17 00:00:00 2001 From: guigues Date: Wed, 6 Feb 2008 08:14:03 +0000 Subject: [PATCH] *** empty log message *** --- kernel/doc/CMakeLists.txt | 14 ++++- kernel/doc/bbtkWebSite/CMakeLists.txt | 13 ++++ kernel/doc/index-no-frame.html.in | 14 +++++ kernel/doc/{index.html => index.html.in} | 0 kernel/src/bbtkWxBrowser.cxx | 78 +++++++++++++++++++++--- kernel/src/bbtkWxBrowser.h | 6 +- 6 files changed, 113 insertions(+), 12 deletions(-) create mode 100644 kernel/doc/index-no-frame.html.in rename kernel/doc/{index.html => index.html.in} (100%) diff --git a/kernel/doc/CMakeLists.txt b/kernel/doc/CMakeLists.txt index a0157af..b31f7d3 100755 --- a/kernel/doc/CMakeLists.txt +++ b/kernel/doc/CMakeLists.txt @@ -89,7 +89,7 @@ ENDIF(BUILD_bbtk_DOC AND BUILD_bbtk_DOC_GUIDES_PDF OR BUILD_bbtk_DOC_GUIDES_HTML IF(BUILD_bbtk_DOC) # Configure main page index.html for build tree CONFIGURE_FILE( - index.html + index.html.in ${BBTK_DOC_BUILD_PATH}/index.html @ONLY ) @@ -98,6 +98,18 @@ IF(BUILD_bbtk_DOC) FILES ${BBTK_DOC_BUILD_PATH}/index.html DESTINATION ${BBTK_DOC_INSTALL_PATH} ) + # Configure main page index-no-frame.html for build tree + CONFIGURE_FILE( + index-no-frame.html.in + ${BBTK_DOC_BUILD_PATH}/index-no-frame.html + @ONLY + ) + # Install it + INSTALL( + FILES ${BBTK_DOC_BUILD_PATH}/index-no-frame.html + DESTINATION ${BBTK_DOC_INSTALL_PATH} + ) + # Recurse it bbtkWebSite dir SUBDIRS(bbtkWebSite) diff --git a/kernel/doc/bbtkWebSite/CMakeLists.txt b/kernel/doc/bbtkWebSite/CMakeLists.txt index e25309a..0d1c354 100644 --- a/kernel/doc/bbtkWebSite/CMakeLists.txt +++ b/kernel/doc/bbtkWebSite/CMakeLists.txt @@ -39,3 +39,16 @@ ADD_CUSTOM_COMMAND( ADD_CUSTOM_TARGET(bbdoc_index ALL DEPENDS ${INDEX_OUTPUT} ) +# create make-index.bbs for build / install tree +SET(BBTK_INDEX_ALPHA_FILE index-alpha.html) +SET(BBTK_INDEX_PACKAGES_FILE index-package.html) +SET(BBTK_INDEX_CATEGORIES_FILE index-category.html) +CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/make-index.bbs.in + ${BBTK_BBDOC_BUILD_PATH}/make-index.bbs + @ONLY + ) +INSTALL( + FILES ${BBTK_BBDOC_BUILD_PATH}/make-index.bbs + DESTINATION ${BBTK_BBDOC_INSTALL_PATH} + ) diff --git a/kernel/doc/index-no-frame.html.in b/kernel/doc/index-no-frame.html.in new file mode 100644 index 0000000..f8b5a7d --- /dev/null +++ b/kernel/doc/index-no-frame.html.in @@ -0,0 +1,14 @@ + + + + + + +Redirection + + + + +

Redirection

+ + diff --git a/kernel/doc/index.html b/kernel/doc/index.html.in similarity index 100% rename from kernel/doc/index.html rename to kernel/doc/index.html.in diff --git a/kernel/src/bbtkWxBrowser.cxx b/kernel/src/bbtkWxBrowser.cxx index 996e8a5..f0df6cf 100644 --- a/kernel/src/bbtkWxBrowser.cxx +++ b/kernel/src/bbtkWxBrowser.cxx @@ -3,11 +3,12 @@ #include "bbtkWxBrowser.h" #include "bbtkWxBlackBox.h" +#include "bbtkConfigurationFile.h" namespace bbtk { - + //======================================================================== void WxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& e) { // std::cout << "WxHtmlWindow::OnLink"<Add ( mwxForwardButton, 0, wxALIGN_CENTRE | wxTOP | wxBOTTOM , 10); - + mwxHomeButton = new wxButton( panel, home_id,_T("~"),wxDefaultPosition, + wxDefaultSize,wxBU_EXACTFIT); + bsizer->Add ( mwxHomeButton, 0, wxALIGN_CENTRE | + wxLEFT | wxTOP | wxBOTTOM , 10 ); + + mwxMakeIndexButton = new wxButton( panel, index_id, + _T("*"),wxDefaultPosition, + wxDefaultSize,wxBU_EXACTFIT); + bsizer->Add ( mwxMakeIndexButton, 0, wxALIGN_CENTRE | + wxLEFT | wxTOP | wxBOTTOM , 10 ); + mwxURL = new wxTextCtrl(panel,url_id,_T(""), wxDefaultPosition, wxDefaultSize, @@ -130,8 +149,10 @@ namespace bbtk WxBrowser::OnCell ) ); */ } - + //======================================================================== + + //======================================================================== bool WxBrowser::GoTo(std::string& file) { // std::cout << "goto"<HistoryBack(); UpdateURL(); } - + //======================================================================== + + //======================================================================== void WxBrowser::OnForwardButton(wxCommandEvent& ) { // std::cout << "forward"<HistoryForward(); UpdateURL(); } + //======================================================================== + + //======================================================================== + void WxBrowser::OnHomeButton(wxCommandEvent& ) + { + std::string url = ConfigurationFile::GetInstance().Get_url(); + url += "/bbtkWebSite/menu.html"; + GoTo(url); + } + //======================================================================== + + //======================================================================== + void WxBrowser::OnMakeIndexButton(wxCommandEvent& ) + { + /* + std::string bbdoc = ConfigurationFile::GetInstance().Get_url(); + bbdoc += "/bbdoc"; + std::string command("cd "); + command += bbdoc; + command += " & bbi -q -n make-index.bbs"; + system(command.c_str()); + */ + } + //======================================================================== + //======================================================================== void WxBrowser::OnURLEnter( wxCommandEvent&) { //std::cout << "OnURL"<LoadPage(mwxURL->GetValue()); } - + //======================================================================== + //======================================================================== void WxBrowser::OnLinkClicked(wxHtmlLinkEvent& e) { std::cout << "WxBrowser::OnLinkClicked"<LoadPage(e.GetLinkInfo().GetHref()); UpdateURL(); } + //======================================================================== + /* void WxBrowser::OnCell(wxHtmlCellEvent& ) { std::cout << "OnCell"<Clear(); mwxURL->AppendText(s); } + //======================================================================== + + //======================================================================== void WxBrowser::SetSize( wxSize s) { // wxPanel::SetSize(s); mwxHtmlWindow->SetSize(s); Fit(); } - + //======================================================================== } #endif diff --git a/kernel/src/bbtkWxBrowser.h b/kernel/src/bbtkWxBrowser.h index faea946..2554a17 100644 --- a/kernel/src/bbtkWxBrowser.h +++ b/kernel/src/bbtkWxBrowser.h @@ -44,7 +44,9 @@ namespace bbtk void OnBackButton(wxCommandEvent& ); void OnForwardButton(wxCommandEvent& ); - void OnLinkClicked(wxHtmlLinkEvent& ); + void OnHomeButton(wxCommandEvent& ); + void OnMakeIndexButton(wxCommandEvent& ); + void OnLinkClicked(wxHtmlLinkEvent& ); void OnURLEnter( wxCommandEvent&); void UpdateURL(); // void OnCell(wxHtmlCellEvent& ); @@ -56,6 +58,8 @@ namespace bbtk wxTextCtrl* mwxURL; wxButton* mwxBackButton; wxButton* mwxForwardButton; + wxButton* mwxHomeButton; + wxButton* mwxMakeIndexButton; // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() -- 2.45.1