ticket:120
I reenabled calling QtAssistant for help on windows to get around the lack
of a python standard library. However, I forgot to update the define
for initializing the QtAssistant. Needless to say an unininitialized
QtAssistantClient pointer wasn't terribly useful.
void MussaWindow::setupAssistant()
{
void MussaWindow::setupAssistant()
{
-#if defined(QT_ASSISTANT_FOUND)
+#if defined(QT_QTASSISTANT_FOUND)
QStringList manualAssistantArgs;
manualAssistantArgs = QStringList();
manualAssistantArgs << "-profile" << "./doc/manual/mussagl_manual.adp";
QStringList manualAssistantArgs;
manualAssistantArgs = QStringList();
manualAssistantArgs << "-profile" << "./doc/manual/mussagl_manual.adp";
#if defined(QT_QTASSISTANT_FOUND)
if (manualAssistant) {
manualAssistant->openAssistant();
#if defined(QT_QTASSISTANT_FOUND)
if (manualAssistant) {
manualAssistant->openAssistant();
+ } else {
+ QMessageBox::warning(this,
+ tr("Mussa Help Error"),
+ tr("QtAssistant not setup correctly"),
+ QMessageBox::Ok,
+ QMessageBox::NoButton,
+ QMessageBox::NoButton);
}
#else
try {
boost::python::object webopen = get_py()["webbrowser.open"];
webopen("http://woldlab.caltech.edu/~king/mussagl_manual/");
}
#else
try {
boost::python::object webopen = get_py()["webbrowser.open"];
webopen("http://woldlab.caltech.edu/~king/mussagl_manual/");
} catch( boost::python::error_already_set ) {
PyErr_Print();
} catch( boost::python::error_already_set ) {
PyErr_Print();
+ QMessageBox::warning(this,
+ tr("Mussa Help Error"),
+ tr("Unable to launch webbrowser"),
+ QMessageBox::Ok,
+ QMessageBox::NoButton,
+ QMessageBox::NoButton);
}
#endif //QT_QTASSISTANT_FOUND
}
#endif //QT_QTASSISTANT_FOUND
- QMessageBox::warning(this,
- tr("Unhelpful Help"),
- tr("Error loading help"),
- QMessageBox::Ok,
- QMessageBox::NoButton,
- QMessageBox::NoButton);
}
void MussaWindow::assistantError(QString message)
}
void MussaWindow::assistantError(QString message)