Skip to content

Commit

Permalink
MDI fix and Mac environment for qcodeedit
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.clifford.at/openscad/trunk@506 b57f626f-c46c-0410-a088-ec61d464b74c
  • Loading branch information
kintel committed Apr 3, 2010
1 parent 8184de7 commit 5f02e63
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion mjau.gdb
@@ -1 +1 @@
set environment DYLD_LIBRARY_PATH=/Users/kintel/code/metalab/checkout/OpenSCAD/OpenCSG-1.2.0/lib
set environment DYLD_LIBRARY_PATH=/Users/kintel/code/metalab/checkout/OpenSCAD/OpenCSG-1.3.0/lib:/Users/kintel/code/metalab/checkout/OpenSCAD/qcodeedit-2.2.3/install/lib
1 change: 1 addition & 0 deletions setenv_mjau.sh
@@ -1,3 +1,4 @@
export OPENCSGDIR=$PWD/../OpenCSG-1.3.0
export CGALDIR=$PWD/../install/CGAL-3.6
export QCODEEDITDIR=$PWD/../qcodeedit-2.2.3/install
export DYLD_LIBRARY_PATH=$OPENCSGDIR/lib:$QCODEEDITDIR/lib
5 changes: 5 additions & 0 deletions src/mainwin.cc
Expand Up @@ -412,7 +412,12 @@ void
MainWindow::openFile(const QString &new_filename)
{
#ifdef ENABLE_MDI
#ifdef _QCODE_EDIT_
if (this->editor->document()->lines() > 1 ||
!this->editor->document()->text(true, false).trimmed().isEmpty()) {
#else
if (!editor->toPlainText().isEmpty()) {
#endif
new MainWindow(new_filename);
clearCurrentOutput();
return;
Expand Down

0 comments on commit 5f02e63

Please sign in to comment.