diff --git a/images/blackback.png b/images/blackback.png
index e3c021fc..3f9fcea2 100644
Binary files a/images/blackback.png and b/images/blackback.png differ
diff --git a/images/blackfront.png b/images/blackfront.png
index c95c58f8..81e8977c 100644
Binary files a/images/blackfront.png and b/images/blackfront.png differ
diff --git a/images/surface.png b/images/surface.png
new file mode 100644
index 00000000..7839cecb
Binary files /dev/null and b/images/surface.png differ
diff --git a/images/wireframe1.png b/images/wireframe1.png
new file mode 100644
index 00000000..c2fe1b12
Binary files /dev/null and b/images/wireframe1.png differ
diff --git a/openscad.qrc b/openscad.qrc
index 72b9f359..6fa311fa 100644
--- a/openscad.qrc
+++ b/openscad.qrc
@@ -41,5 +41,7 @@
images/blackaxes.png
images/zoomin.png
images/zoomout.png
+ images/wireframe1.png
+ images/surface.png
diff --git a/src/MainWindow.h b/src/MainWindow.h
index fd7b8b12..e80bf19d 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -1,6 +1,7 @@
#pragma once
#include
+#include
#include "ui_MainWindow.h"
#include "openscad.h"
#include "modcontext.h"
diff --git a/src/editortoolbar.cpp b/src/editortoolbar.cpp
index 9bf3c389..6f957282 100644
--- a/src/editortoolbar.cpp
+++ b/src/editortoolbar.cpp
@@ -16,15 +16,25 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
buttonNew->setIcon(QIcon("://images/blackNew.png"));
buttonOpen->setIcon(QIcon("://images/Open-32(1).png"));
buttonSave->setIcon(QIcon("://images/Save-32.png"));
+ buttonZoomIn->setIcon(QIcon("://images/zoomin.png"));
+ buttonZoomOut->setIcon(QIcon("://images/zoomout.png"));
} else {
- buttonNew->setIcon(QIcon("://images/Document-New-128.png"));
- buttonOpen->setIcon(QIcon("://images/Open-128.png"));
- buttonSave->setIcon(QIcon("://images/Save-128.png"));
- }
+ buttonNew->setIcon(QIcon("://images/Document-New-128.png"));
+ buttonOpen->setIcon(QIcon("://images/Open-128.png"));
+ buttonSave->setIcon(QIcon("://images/Save-128.png"));
+ }
+
+ buttonNew->setToolTip("New");
+ buttonOpen->setToolTip("Open");
+ buttonSave->setToolTip("Save");
+ buttonZoomIn->setToolTip("Zoom In");
+ buttonZoomOut->setToolTip("Zoom Out");
this->addWidget(buttonNew);
this->addWidget(buttonOpen);
this->addWidget(buttonSave);
+ this->addWidget(buttonZoomIn);
+ this->addWidget(buttonZoomOut);
}
diff --git a/src/mainwin.cc b/src/mainwin.cc
index 182f4315..db6efcc6 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -451,14 +451,26 @@ MainWindow::MainWindow(const QString &filename)
connect(this->replaceAllButton, SIGNAL(clicked()), this, SLOT(replaceAll()));
connect(this->replaceInputField, SIGNAL(returnPressed()), this->replaceButton, SLOT(animateClick()));
- //EditorToolbar
- connect(editortoolbar->buttonNew, SIGNAL(clicked()), this, SLOT(actionNew()));
- connect(editortoolbar->buttonOpen, SIGNAL(clicked()), this, SLOT(actionOpen()));
- connect(editortoolbar->buttonSave, SIGNAL(clicked()), this, SLOT(actionSave()));
+ //EditorToolbar
+ connect(editortoolbar->buttonNew, SIGNAL(clicked()), this, SLOT(actionNew()));
+ connect(editortoolbar->buttonOpen, SIGNAL(clicked()), this, SLOT(actionOpen()));
+ connect(editortoolbar->buttonSave, SIGNAL(clicked()), this, SLOT(actionSave()));
+ connect(editortoolbar->buttonZoomIn, SIGNAL(clicked()), editor, SLOT(zoomIn()));
+ connect(editortoolbar->buttonZoomOut, SIGNAL(clicked()), editor, SLOT(zoomOut()));
+
//Toolbar
- toolBar = new ToolBar(this);
- verticalLayout_2->addWidget(toolBar);
+ toolBar = new ToolBar(this);
+ verticalLayout_2->addWidget(toolBar);
+ int defaultcolor = toolBar->palette().background().color().lightness();
+
+ if(defaultcolor > 165){
+ viewActionShowAxes->setIcon(QIcon("://images/blackaxes.png"));
+ toolBar->addAction(viewActionShowAxes);
+ viewActionShowEdges->setIcon(QIcon("://images/Rotation-32.png"));
+ toolBar->addAction(viewActionShowEdges);
+ }
+
connect(toolBar->buttonRender, SIGNAL(clicked()), this, SLOT(actionRender()));
connect(toolBar->buttonTop, SIGNAL(clicked()), this, SLOT(viewAngleTop()));
connect(toolBar->buttonBottom, SIGNAL(clicked()), this, SLOT(viewAngleBottom()));
@@ -466,16 +478,13 @@ MainWindow::MainWindow(const QString &filename)
connect(toolBar->buttonRight, SIGNAL(clicked()), this, SLOT(viewAngleRight()));
connect(toolBar->buttonFront, SIGNAL(clicked()), this, SLOT(viewAngleFront()));
connect(toolBar->buttonBack, SIGNAL(clicked()), this, SLOT(viewModeShowAxes()));
- connect(toolBar->buttonAxes, SIGNAL(triggered()), this, SLOT(viewModeShowAxes()));
- connect(toolBar->buttonEdges, SIGNAL(clicked()), this, SLOT(viewModeShowEdges()));
connect(toolBar->buttonZoomIn, SIGNAL(clicked()), qglview, SLOT(ZoomIn()));
connect(toolBar->buttonZoomOut, SIGNAL(clicked()), qglview, SLOT(ZoomOut()));
-
+ connect(toolBar->buttonSurface, SIGNAL(clicked()), this, SLOT(viewModeSurface()));
+ connect(toolBar->buttonWireframe, SIGNAL(clicked()), this, SLOT(viewModeWireframe()));
+
toolBar->setStyleSheet("QToolBar{border:1 solid black;}" );
- // "QToolButton:hover{background-color:green;}");
- //std::cout<< toolBar->palette().background().color().name().toStdString()<palette().background().color().lightness()< 165)
{
buttonRender->setIcon(QIcon("://images/blackRender.png"));
+ buttonRender->setToolTip("Render");
buttonTop->setIcon(QIcon("://images/blackUp.png"));
buttonBottom->setIcon(QIcon("://images/blackbottom.png"));
buttonLeft->setIcon(QIcon("://images/blackleft (copy).png"));
buttonRight->setIcon(QIcon("://images/rightright.png"));
buttonFront->setIcon(QIcon("://images/blackfront.png"));
buttonBack->setIcon(QIcon("://images/blackback.png"));
- buttonAxes->setIcon(QIcon("://images/blackaxes.png"));
- buttonEdges->setIcon(QIcon("://images/Rotation-32.png"));
buttonZoomIn->setIcon(QIcon("://images/zoomin.png"));
buttonZoomOut->setIcon(QIcon("://images/zoomout.png"));
+ buttonWireframe->setIcon(QIcon("://images/wireframe1.png"));
+ buttonSurface->setIcon(QIcon("://images/surface.png"));
} else {
buttonRender->setIcon(QIcon("://images/Arrowhead-Right-32.png"));
@@ -39,11 +40,20 @@ ToolBar::ToolBar(QWidget *parent) :
buttonRight->setIcon(QIcon("://images/right.png"));
buttonFront->setIcon(QIcon("://images/front.png"));
buttonBack->setIcon(QIcon("://images/back.png"));
- buttonAxes->setIcon(QIcon("://images/axes.png"));
- buttonEdges->setIcon(QIcon("://images/grid.png"));
}
-
+ buttonRender->setToolTip("Render");
+ buttonTop->setToolTip("Top");
+ buttonBottom->setToolTip("Bottom");
+ buttonLeft->setToolTip("Left");
+ buttonRight->setToolTip("Right");
+ buttonFront->setToolTip("Front");
+ buttonBack->setToolTip("Back");
+ buttonZoomIn->setToolTip("Zoom in");
+ buttonZoomOut->setToolTip("Zoom out");
+ buttonWireframe->setToolTip("Wireframe");
+ buttonSurface->setToolTip("Surfaces");
+
this->addWidget(buttonRender);
this->addSeparator();
this->addWidget(buttonTop);
@@ -52,8 +62,8 @@ ToolBar::ToolBar(QWidget *parent) :
this->addWidget(buttonRight);
this->addWidget(buttonFront);
this->addWidget(buttonBack);
- this->addAction(buttonAxes);
- this->addWidget(buttonEdges);
this->addWidget(buttonZoomIn);
this->addWidget(buttonZoomOut);
+ this->addWidget(buttonWireframe);
+ this->addWidget(buttonSurface);
}
diff --git a/src/toolbar.h b/src/toolbar.h
index 7777876a..08ebdcb4 100644
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -11,8 +11,8 @@ public:
explicit ToolBar(QWidget *parent = 0);
QToolButton *buttonZoomIn, *buttonZoomOut, *buttonRender;
QToolButton *buttonTop, *buttonBottom, *buttonLeft, *buttonRight;
- QToolButton *buttonFront, *buttonBack, *buttonEdges;
- QAction *buttonAxes;
+ QToolButton *buttonFront, *buttonBack, *buttonWireframe, *buttonSurface;
+
signals:
public slots: