summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MainWindow.h2
-rw-r--r--MainWindow.ui21
-rw-r--r--TODO.txt3
-rw-r--r--mainwin.cc20
4 files changed, 43 insertions, 3 deletions
diff --git a/MainWindow.h b/MainWindow.h
index f1539f0..3c45658 100644
--- a/MainWindow.h
+++ b/MainWindow.h
@@ -77,6 +77,7 @@ private slots:
void editUncomment();
void pasteViewportTranslation();
void pasteViewportRotation();
+ void hideEditor();
private slots:
void actionReloadCompile();
@@ -117,6 +118,7 @@ public slots:
void viewCenter();
void viewPerspective();
void viewOrthogonal();
+ void hideConsole();
void animateUpdateDocChanged();
void animateUpdate();
void dragEnterEvent(QDragEnterEvent *event);
diff --git a/MainWindow.ui b/MainWindow.ui
index d1fd76c..6eda078 100644
--- a/MainWindow.ui
+++ b/MainWindow.ui
@@ -98,7 +98,7 @@
<x>0</x>
<y>0</y>
<width>681</width>
- <height>22</height>
+ <height>25</height>
</rect>
</property>
<widget class="QMenu" name="menu_File">
@@ -179,6 +179,9 @@
<addaction name="separator"/>
<addaction name="viewActionPerspective"/>
<addaction name="viewActionOrthogonal"/>
+ <addaction name="separator"/>
+ <addaction name="editActionHide"/>
+ <addaction name="viewActionHide"/>
</widget>
<widget class="QMenu" name="menuHelp">
<property name="title">
@@ -340,6 +343,14 @@
<string>Ctrl+-</string>
</property>
</action>
+ <action name="editActionHide">
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>Hide editor</string>
+ </property>
+ </action>
<action name="designActionReloadAndCompile">
<property name="text">
<string>&amp;Reload and Compile</string>
@@ -554,6 +565,14 @@
<string>Orthogonal</string>
</property>
</action>
+ <action name="viewActionHide">
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>Hide console</string>
+ </property>
+ </action>
<action name="helpActionAbout">
<property name="text">
<string>About</string>
diff --git a/TODO.txt b/TODO.txt
index a24bfe4..0db553f 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -3,6 +3,7 @@ BUGS
----
o On Linux, large files load veery slowly
o Some invalid DXF data gets pass the import checks and breaks the tessing code
+o Broken polyhedron() entities are not correctly detected and cause CGAL segfaults
USER iNTERFACE
--------------
@@ -13,8 +14,6 @@ o Preferences
- OpenGL params
- Default language feature settings
o External editor
-o Hide/show editor
-o hide/show log widget
o Mac OS X:
- embed examples into bundle -> separate example menu?
- Use examples as default File Open folder
diff --git a/mainwin.cc b/mainwin.cc
index 6649858..f024221 100644
--- a/mainwin.cc
+++ b/mainwin.cc
@@ -177,6 +177,7 @@ MainWindow::MainWindow(const char *filename)
connect(this->editActionPasteVPR, SIGNAL(triggered()), this, SLOT(pasteViewportRotation()));
connect(this->editActionZoomIn, SIGNAL(triggered()), editor, SLOT(zoomIn()));
connect(this->editActionZoomOut, SIGNAL(triggered()), editor, SLOT(zoomOut()));
+ connect(this->editActionHide, SIGNAL(triggered()), this, SLOT(hideEditor()));
// Design menu
connect(this->designActionReloadAndCompile, SIGNAL(triggered()), this, SLOT(actionReloadCompile()));
@@ -224,6 +225,7 @@ MainWindow::MainWindow(const char *filename)
connect(this->viewActionCenter, SIGNAL(triggered()), this, SLOT(viewCenter()));
connect(this->viewActionPerspective, SIGNAL(triggered()), this, SLOT(viewPerspective()));
connect(this->viewActionOrthogonal, SIGNAL(triggered()), this, SLOT(viewOrthogonal()));
+ connect(this->viewActionHide, SIGNAL(triggered()), this, SLOT(hideConsole()));
// #ifdef ENABLE_CGAL
// viewActionCGALSurface = menu->addAction("CGAL Surfaces", this, SLOT(viewModeCGALSurface()), QKeySequence(Qt::Key_F10));
@@ -790,6 +792,15 @@ void MainWindow::editUncomment()
editor->setTextCursor(cursor);
}
+void MainWindow::hideEditor()
+{
+ if (editActionHide->isChecked()) {
+ editor->hide();
+ } else {
+ editor->show();
+ }
+}
+
void MainWindow::pasteViewportTranslation()
{
QTextCursor cursor = editor->textCursor();
@@ -1421,6 +1432,15 @@ void MainWindow::viewOrthogonal()
screen->updateGL();
}
+void MainWindow::hideConsole()
+{
+ if (viewActionHide->isChecked()) {
+ console->hide();
+ } else {
+ console->show();
+ }
+}
+
void MainWindow::dragEnterEvent(QDragEnterEvent *event)
{
if (event->mimeData()->hasUrls())
contact: Jan Huwald // Impressum