From: guigues Date: Wed, 10 Sep 2008 12:38:24 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: v0.8.0~108 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=021237c756df811984977630aa73e724531aad06;p=bbtk.git *** empty log message *** --- diff --git a/kernel/doc/bbtkWebSite/help_contents.html b/kernel/doc/bbtkWebSite/help_contents.html new file mode 100644 index 0000000..e8f2c32 --- /dev/null +++ b/kernel/doc/bbtkWebSite/help_contents.html @@ -0,0 +1,29 @@ + + + + Help Contents + + + +

Help Contents

+ +Demos
+Examples + +

Guides

+ +User's Guide
+Package Developer's Guide
+Developer's Guide
+Reference Manual (to be written)
+bbtk library doxygen doc
+ +

Boxes

+ +Alphabetical list
+List by package
+List by category
+List of adaptors
+ + + diff --git a/kernel/src/bbtkWxGUIHtmlBrowser.cxx b/kernel/src/bbtkWxGUIHtmlBrowser.cxx index c44820f..adaea1b 100644 --- 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/06/10 19:19:42 $ - Version: $Revision: 1.6 $ + Date: $Date: 2008/09/10 12:38:24 $ + Version: $Revision: 1.7 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -219,7 +219,7 @@ namespace bbtk void WxGUIHtmlBrowser::GoHome() { std::string url = ConfigurationFile::GetInstance().Get_doc_path(); - url += "/bbtkWebSite/menu.html"; + url += "/bbtkWebSite/help_contents.html"; GoTo(url); mwxURL->Clear(); diff --git a/kernel/src/bbtkWxGUIScriptingInterface.cxx b/kernel/src/bbtkWxGUIScriptingInterface.cxx index d176ba3..2eb5ebe 100644 --- a/kernel/src/bbtkWxGUIScriptingInterface.cxx +++ b/kernel/src/bbtkWxGUIScriptingInterface.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxGUIScriptingInterface.cxx,v $ Language: C++ - Date: $Date: 2008/09/10 09:25:19 $ - Version: $Revision: 1.17 $ + Date: $Date: 2008/09/10 12:38:24 $ + Version: $Revision: 1.18 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -39,6 +39,7 @@ #include "bbtkWxStreamRedirector.h" #include "bbtkUtilities.h" +#include //#include "icons/cc_run.xpm" @@ -233,9 +234,14 @@ namespace bbtk // mwxNotebook->SetSelection(1); mWxGUIHtmlBrowser->GoHome(); // Refresh(); -// m_mgr.Update(); + m_mgr.Update(); // LoadPerspective(); + + wxTipWindow* tip = new wxTipWindow(this, + _T("\n Welcome to bbStudio !\n\n To run a demo or example:\n 1. click on the 'Demos' or 'Examples' link\n 2. select a demo or example\n 3. click on the '[source]' link : the source file is loaded in bbStudio\n 4. click on the 'Run' button (the arrow at the bottom right of the source file) \n"),1000); + tip->CenterOnParent(); + tip->Show(); } //================================================================ @@ -543,6 +549,11 @@ namespace bbtk f.open(fname.c_str(), std::ios::out ); f << conf << std::endl; + int x,y; + GetPosition(&x,&y); + f << x << " " << y << std::endl; + + int w,h; GetSize(&w,&h); @@ -566,14 +577,17 @@ namespace bbtk std::string conf; f >> conf; - int w,h; + int x,y; + f >> x >> y ; + int w,h; f >> w >> h ; f.close(); // std::cout << conf << std::endl; + Move(x,y); SetSize(w,h); m_mgr.LoadPerspective(std2wx(conf)); }