|
Check-in Number:
|
4089 | |
| Date: |
2003-Feb-27 14:57:47 (local)
2003-Feb-27 13:57:47 (UTC) |
| User: | ms |
| Branch: | |
| Comment: |
Hook in new help contents browser logic on activation of helpContents signal. |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/as/as-gui/as_assist.cpp 1.112 -> 1.113
--- as_assist.cpp 2003/02/21 23:42:09 1.112
+++ as_assist.cpp 2003/02/27 13:57:47 1.113
@@ -501,8 +501,7 @@
if (pHelppopup == NULL) // Sanity check
throw Genexcept("Main window help popup creation failed.");
m_pMenubar->insertItem(trUtf8("&Help"), pHelppopup);
- nMenuid = pHelppopup->insertItem(trUtf8("&Contents"), this, SLOT(helpContents()), Key_F1);
- pHelppopup->setItemEnabled(nMenuid, false);
+ pHelppopup->insertItem(trUtf8("&Contents"), this, SLOT(helpContents()), Key_F1);
pHelppopup->insertSeparator();
pHelppopup->insertItem(trUtf8("About &AS-GUI"), this, SLOT(aboutTitraq()));
pHelppopup->insertItem(trUtf8("About &OSSP"), this, SLOT(aboutOSSP()));
|
|
ossp-pkg/as/as-gui/as_slot.cpp 1.133 -> 1.134
--- as_slot.cpp 2003/02/25 09:29:58 1.133
+++ as_slot.cpp 2003/02/27 13:57:47 1.134
@@ -63,6 +63,7 @@
#include "as_pref.h" // For Preferences class
#include "as_panel.h" // For Prefpanel class
#include "as_reportpanel.h" // For Reportpanel class
+#include "as_helpanel.h" // For Helpanel class
#include "as_sfile.h" // For Simplefile class
#include "as_table.h" // For TiTable class
@@ -1858,8 +1859,15 @@
//
void Titraqform::helpContents(void)
{
- Prototype Unimp;
- Unimp.doMbox();
+ try { // Create and execute a new help contents window
+ std::auto_ptr<AS::Helpanel> pHelpcont(new AS::Helpanel(this, "Helpanel"));
+ pHelpcont->exec();
+ delete pHelpcont.release(); // Technically unnecessary, smart pointer
+ }
+ catch (Genexcept& Genex) {
+ Genex.reportErr();
+ return;
+ }
}
//
|
|
