Merge pull request #6634 from yorikvanhavre/retire-qassistant-2
Retire qassistant (try 2)
This commit is contained in:
@@ -692,18 +692,20 @@ void MainWindow::whatsThis()
|
||||
|
||||
void MainWindow::showDocumentation(const QString& help)
|
||||
{
|
||||
// temporary - allows to enable/disable the use of the Help module
|
||||
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Help");
|
||||
bool useHelpModule = hGrp->GetBool("UseHelpModule", false);
|
||||
if (useHelpModule) {
|
||||
Base::PyGILStateLocker lock;
|
||||
PyObject* module = PyImport_ImportModule("Help");
|
||||
if (module) {
|
||||
Py_DECREF(module);
|
||||
Gui::Command::addModule(Gui::Command::Gui,"Help");
|
||||
Gui::Command::doCommand(Gui::Command::Gui,"Help.show(\"%s\")", help.toStdString().c_str());
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
PyErr_Clear();
|
||||
QUrl url(help);
|
||||
if (url.scheme().isEmpty()) {
|
||||
QString page;
|
||||
page = QString::fromUtf8("%1.html").arg(help);
|
||||
d->assistant->showDocumentation(page);
|
||||
QMessageBox::critical(getMainWindow(), tr("Help addon needed!"),
|
||||
tr("The Help system of %s is now handled by the \"Help\" addon. "
|
||||
"Install it with menu Tools > Addons Manager"),qApp->applicationName());
|
||||
}
|
||||
else {
|
||||
QDesktopServices::openUrl(url);
|
||||
|
||||
Reference in New Issue
Block a user