diff options
| author | don bright <hugh.m.bright@gmail.com> | 2011-12-09 16:49:55 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2011-12-09 16:49:55 (GMT) |
| commit | a4a64e7c26a0eb523f5b271c9d90f091e5933ebb (patch) | |
| tree | 6e247c3f46c23a6c85b4740a2ff99abaa25fe9bd /src/mainwin.cc | |
| parent | 51f24b998ba555d15f924ccd4fb5b46219f6537b (diff) | |
| parent | f577f91d25071f5ad1a9fdb6ed7c6dd3aa4c1008 (diff) | |
Merge remote-tracking branch 'upstream/master' into cakebaby
Diffstat (limited to 'src/mainwin.cc')
| -rw-r--r-- | src/mainwin.cc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/mainwin.cc b/src/mainwin.cc index c81f2f2..4b4321d 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -312,6 +312,7 @@ MainWindow::MainWindow(const QString &filename) connect(this->helpActionAbout, SIGNAL(triggered()), this, SLOT(helpAbout())); connect(this->helpActionHomepage, SIGNAL(triggered()), this, SLOT(helpHomepage())); connect(this->helpActionManual, SIGNAL(triggered()), this, SLOT(helpManual())); + connect(this->helpActionOpenGLInfo, SIGNAL(triggered()), this, SLOT(helpOpenGL())); console->setReadOnly(true); @@ -1752,6 +1753,18 @@ MainWindow::helpManual() QDesktopServices::openUrl(QUrl("http://en.wikibooks.org/wiki/OpenSCAD_User_Manual")); } +void MainWindow::helpOpenGL() +{ + if (!this->openglbox) { + this->openglbox = new QMessageBox(QMessageBox::Information, + "OpenGL Info", "Detailed OpenGL Info", + QMessageBox::Ok, this); + + } + this->openglbox->setDetailedText(this->glview->getRendererInfo()); + this->openglbox->show(); +} + /*! FIXME: In MDI mode, should this be called on both reload functions? */ @@ -1822,3 +1835,4 @@ void MainWindow::clearCurrentOutput() { set_output_handler(NULL, NULL); } + |