Skip to content

Commit

Permalink
Revert "manuals in browser rc (#4975)" (#5071)
Browse files Browse the repository at this point in the history
This reverts commit 88be2a2.

We're encountering some issues with opening the docs on certain systems.
We need to figure out a better way of handling this. Reverting for the time being.
  • Loading branch information
aowen87 authored Sep 16, 2020
1 parent a83c54a commit 2f8b8d8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 23 deletions.
23 changes: 1 addition & 22 deletions src/gui/QvisHelpWindow.C
Original file line number Diff line number Diff line change
Expand Up @@ -1405,10 +1405,6 @@ QvisHelpWindow::displayHome()
// Kathleen Bonnell, Thu Apr 8 17:20:52 PST 2010
// Convert file to url so it will work on windows.
//
// Alister Maguire, Thu Aug 13 16:50:36 PDT 2020
// Updated so that the VisIt manuals are rendered in the user's default
// web browser.
//
// ****************************************************************************

bool
Expand All @@ -1421,24 +1417,7 @@ QvisHelpWindow::displayPage(const QString &page, bool reload)
QString file(CompleteFileName(page));
if(QFile(file).exists())
{
//
// We open the VisIt manuals using the user's default browser. All
// other pages are rendered inside of the widget using Qt.
//
if (page == manualPath)
{
helpBrowser->clear();
if (!QDesktopServices::openUrl(QUrl::fromLocalFile(file)))
{
Error(tr("The VisIt Manuals were unable to be "
"opened."));
}
}
else
{
helpBrowser->setSource(QUrl::fromLocalFile(file));
}

helpBrowser->setSource(QUrl::fromLocalFile(file));
helpFile = page;
retval = true;
}
Expand Down
1 change: 0 additions & 1 deletion src/resources/help/en_US/relnotes3.1.3.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
<li>Added the Tessellate operator, which tessellates high order elements into linear elements. The following high order cell types are supported: QUADRATIC_EDGE, CUBIC_LINE, LAGRANGE_TRIANGLE, QUADRATIC_TRIANGLE, BIQUADRATIC_TRIANGLE, LAGRANGE_QUADRILATERAL, BIQUADRATIC_QUAD, QUADRATIC_QUAD, LAGRANGE_TETRAHEDRON, QUATRADIC_TETRA, LAGRANGE_HEXAHEDRON and QUADRATIC_HEXAHEDRON. All unsupported types will be removed from the mesh.</li>
<li>Added parallel support for Remap operator.</li>
<li>Added host profiles for the Lawrence Livermore National Laboratory's Tron system. Removed the host profiles for the Lawrence Livermore National Laboratory's Cmax system.</li>
<li>Enhanced the VisIt Help menu such that the VisIt Manuals are opened in the user's default web browser instead of being rendered in the GUI window.</li>
</ul>

<a name="Dev_changes"></a>
Expand Down

0 comments on commit 2f8b8d8

Please sign in to comment.