diff options
| author | Marius Kintel <marius@kintel.net> | 2013-05-09 10:18:51 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-05-09 10:18:51 (GMT) |
| commit | f46118da22f806d05b410cced0f9b06ea00ac02c (patch) | |
| tree | e42fece860be6d224744ba5401bf35e783dddd62 /src/mainwin.cc | |
| parent | f8ad66c8bbb3c78548c2e4b3b930f82d4a57b345 (diff) | |
| parent | ad8ba77a15efd745fe7845e085b3daefd3f58e81 (diff) | |
Merge branch 'master' into issue352
Diffstat (limited to 'src/mainwin.cc')
| -rw-r--r-- | src/mainwin.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/mainwin.cc b/src/mainwin.cc index 027f72a..5f9d633 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -488,17 +488,25 @@ void MainWindow::requestOpenFile(const QString &) void MainWindow::openFile(const QString &new_filename) { + QString actual_filename = new_filename; #ifdef ENABLE_MDI if (!editor->toPlainText().isEmpty()) { - new MainWindow(new_filename); + QFileInfo fi(new_filename); + if (fi.suffix().toLower().contains(QRegExp("^(stl|off|dxf)$"))) { + actual_filename = QString(); + } + new MainWindow(actual_filename); clearCurrentOutput(); return; } #endif - setFileName(new_filename); + setFileName(actual_filename); refreshDocument(); updateRecentFiles(); + if (actual_filename.isEmpty()) { + this->editor->setPlainText(QString("import(\"%1\");\n").arg(new_filename)); + } } void |