diff --git a/images/Open-32(1).png b/images/Open-32(1).png new file mode 100644 index 00000000..576e58e2 Binary files /dev/null and b/images/Open-32(1).png differ diff --git a/images/Open-32.png b/images/Open-32.png new file mode 100644 index 00000000..b90a144d Binary files /dev/null and b/images/Open-32.png differ diff --git a/images/Rotation-32.png b/images/Rotation-32.png new file mode 100644 index 00000000..61608049 Binary files /dev/null and b/images/Rotation-32.png differ diff --git a/images/Save-32.png b/images/Save-32.png new file mode 100644 index 00000000..89c1e742 Binary files /dev/null and b/images/Save-32.png differ diff --git a/images/Shape-Cube-32.png b/images/Shape-Cube-32.png new file mode 100644 index 00000000..d0450589 Binary files /dev/null and b/images/Shape-Cube-32.png differ diff --git a/images/blackNew.png b/images/blackNew.png new file mode 100644 index 00000000..8e9b1439 Binary files /dev/null and b/images/blackNew.png differ diff --git a/images/blackRender.png b/images/blackRender.png new file mode 100644 index 00000000..da50aee5 Binary files /dev/null and b/images/blackRender.png differ diff --git a/images/blackUp.png b/images/blackUp.png new file mode 100644 index 00000000..0f6375d0 Binary files /dev/null and b/images/blackUp.png differ diff --git a/images/blackUp1.png b/images/blackUp1.png new file mode 100644 index 00000000..8d132b91 Binary files /dev/null and b/images/blackUp1.png differ diff --git a/images/blackUp2.png b/images/blackUp2.png new file mode 100644 index 00000000..fa9ec136 Binary files /dev/null and b/images/blackUp2.png differ diff --git a/images/blackUp4.png b/images/blackUp4.png new file mode 100644 index 00000000..c1d62c19 Binary files /dev/null and b/images/blackUp4.png differ diff --git a/images/blackUp5.png b/images/blackUp5.png new file mode 100644 index 00000000..dce53e55 Binary files /dev/null and b/images/blackUp5.png differ diff --git a/images/blackaxes.png b/images/blackaxes.png new file mode 100644 index 00000000..c1714bc8 Binary files /dev/null and b/images/blackaxes.png differ diff --git a/images/blackback.png b/images/blackback.png new file mode 100644 index 00000000..e3c021fc Binary files /dev/null and b/images/blackback.png differ diff --git a/images/blackbottom (copy).png b/images/blackbottom (copy).png new file mode 100644 index 00000000..4acdd60e Binary files /dev/null and b/images/blackbottom (copy).png differ diff --git a/images/blackbottom.png b/images/blackbottom.png new file mode 100644 index 00000000..4acdd60e Binary files /dev/null and b/images/blackbottom.png differ diff --git a/images/blackbottom1.png b/images/blackbottom1.png new file mode 100644 index 00000000..1480765c Binary files /dev/null and b/images/blackbottom1.png differ diff --git a/images/blackfront.png b/images/blackfront.png new file mode 100644 index 00000000..c95c58f8 Binary files /dev/null and b/images/blackfront.png differ diff --git a/images/blackleft (copy).png b/images/blackleft (copy).png new file mode 100644 index 00000000..7a94a7a4 Binary files /dev/null and b/images/blackleft (copy).png differ diff --git a/images/blackleft.png b/images/blackleft.png new file mode 100644 index 00000000..7a94a7a4 Binary files /dev/null and b/images/blackleft.png differ diff --git a/images/blackright (copy).png b/images/blackright (copy).png new file mode 100644 index 00000000..b5cad6a0 Binary files /dev/null and b/images/blackright (copy).png differ diff --git a/images/blackright.png b/images/blackright.png new file mode 100644 index 00000000..b5cad6a0 Binary files /dev/null and b/images/blackright.png differ diff --git a/images/blackright1.png b/images/blackright1.png new file mode 100644 index 00000000..26e306bf Binary files /dev/null and b/images/blackright1.png differ diff --git a/images/rightright.png b/images/rightright.png new file mode 100644 index 00000000..6788b22f Binary files /dev/null and b/images/rightright.png differ diff --git a/images/zoomin.png b/images/zoomin.png new file mode 100644 index 00000000..ec5430ae Binary files /dev/null and b/images/zoomin.png differ diff --git a/images/zoomout.png b/images/zoomout.png new file mode 100644 index 00000000..bd012c7e Binary files /dev/null and b/images/zoomout.png differ diff --git a/openscad.pro b/openscad.pro index d43fd5fd..69c07181 100644 --- a/openscad.pro +++ b/openscad.pro @@ -307,7 +307,8 @@ src/FontCache.h \ \ src/AutoUpdater.h \ src/legacyeditor.h \ - src/toolbar.h + src/toolbar.h \ + src/editortoolbar.h SOURCES += src/version_check.cc \ src/ProgressWidget.cc \ @@ -395,7 +396,8 @@ SOURCES += src/version_check.cc \ src/mainwin.cc \ src/FontListDialog.cc \ src/legacyeditor.cc \ - src/toolbar.cpp + src/toolbar.cpp \ + src/editortoolbar.cpp # ClipperLib SOURCES += src/polyclipping/clipper.cpp diff --git a/openscad.qrc b/openscad.qrc index 2f7aa662..72b9f359 100644 --- a/openscad.qrc +++ b/openscad.qrc @@ -22,5 +22,24 @@ images/up.png images/bottom.png images/left.png + images/blackUp.png + images/blackNew.png + images/blackRender.png + images/Rotation-32.png + images/Shape-Cube-32.png + images/Open-32.png + images/Open-32(1).png + images/Save-32.png + images/blackbottom.png + images/blackleft (copy).png + images/blackright (copy).png + images/blackright.png + images/blackright1.png + images/rightright.png + images/blackfront.png + images/blackback.png + images/blackaxes.png + images/zoomin.png + images/zoomout.png diff --git a/src/MainWindow.h b/src/MainWindow.h index 4175ff08..fd7b8b12 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -8,6 +8,7 @@ #include "Tree.h" #include "memory.h" #include "editor.h" +#include "editortoolbar.h" #include "toolbar.h" #include #include @@ -111,6 +112,7 @@ private: void setDockWidgetTitle(QDockWidget *dockWidget, QString prefix, bool topLevel); EditorInterface *editor; + EditorToolBar *editortoolbar; ToolBar *toolBar; class QMessageBox *openglbox; diff --git a/src/editortoolbar.cpp b/src/editortoolbar.cpp new file mode 100644 index 00000000..9bf3c389 --- /dev/null +++ b/src/editortoolbar.cpp @@ -0,0 +1,30 @@ +#include "editortoolbar.h" + +EditorToolBar::EditorToolBar(QWidget *parent) : + QToolBar(parent) +{ + int defaultColor = this->palette().background().color().lightness(); + + buttonNew = new QToolButton; + buttonOpen = new QToolButton; + buttonSave = new QToolButton; + buttonZoomIn = new QToolButton; + buttonZoomOut = new QToolButton; + + if(defaultColor > 165) + { + buttonNew->setIcon(QIcon("://images/blackNew.png")); + buttonOpen->setIcon(QIcon("://images/Open-32(1).png")); + buttonSave->setIcon(QIcon("://images/Save-32.png")); + } else { + + buttonNew->setIcon(QIcon("://images/Document-New-128.png")); + buttonOpen->setIcon(QIcon("://images/Open-128.png")); + buttonSave->setIcon(QIcon("://images/Save-128.png")); + } + + this->addWidget(buttonNew); + this->addWidget(buttonOpen); + this->addWidget(buttonSave); + +} diff --git a/src/editortoolbar.h b/src/editortoolbar.h new file mode 100644 index 00000000..c85dae4d --- /dev/null +++ b/src/editortoolbar.h @@ -0,0 +1,21 @@ +#ifndef EDITORTOOLBAR_H +#define EDITORTOOLBAR_H + +#include +#include + +class EditorToolBar : public QToolBar +{ + Q_OBJECT +public: + explicit EditorToolBar(QWidget *parent = 0); + QToolButton *buttonNew, *buttonOpen, *buttonSave; + QToolButton *buttonZoomIn, *buttonZoomOut; + +signals: + +public slots: + +}; + +#endif // EDITORTOOLBAR_H diff --git a/src/mainwin.cc b/src/mainwin.cc index 1124c5c8..182f4315 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -23,6 +23,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ +#include #include "GeometryCache.h" #include "ModuleCache.h" #include "MainWindow.h" @@ -173,6 +174,7 @@ MainWindow::MainWindow(const QString &filename) editortype = Preferences::inst()->getValue("editor/editortype").toString(); useScintilla = (editortype == "QScintilla Editor"); + #ifdef USE_SCINTILLA_EDITOR if (useScintilla) { editor = new ScintillaEditor(editorDockContents); @@ -183,6 +185,9 @@ MainWindow::MainWindow(const QString &filename) editorDockContents->layout()->addWidget(editor); + editortoolbar = new EditorToolBar(this); + editorDockContents->layout()->addWidget(editortoolbar); + setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea); setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea); setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); @@ -398,7 +403,7 @@ MainWindow::MainWindow(const QString &filename) connect(this->helpActionHomepage, SIGNAL(triggered()), this, SLOT(helpHomepage())); connect(this->helpActionManual, SIGNAL(triggered()), this, SLOT(helpManual())); connect(this->helpActionLibraryInfo, SIGNAL(triggered()), this, SLOT(helpLibrary())); - connect(this->helpActionFontInfo, SIGNAL(triggered()), this, SLOT(helpFontInfo())); + connect(this->helpActionFontInfo, SIGNAL(triggered()), this, SLOT(viewModeShowAxes())); setCurrentOutput(); @@ -446,24 +451,32 @@ 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())); + //Toolbar - toolBar = new ToolBar(this); - verticalLayout_2->addWidget(toolBar); - connect(toolBar->buttonNew, SIGNAL(clicked()), this, SLOT(actionNew())); - connect(toolBar->buttonOpen, SIGNAL(clicked()), this, SLOT(actionOpen())); - connect(toolBar->buttonSave, SIGNAL(clicked()), this, SLOT(actionSave())); + toolBar = new ToolBar(this); + verticalLayout_2->addWidget(toolBar); connect(toolBar->buttonRender, SIGNAL(clicked()), this, SLOT(actionRender())); connect(toolBar->buttonTop, SIGNAL(clicked()), this, SLOT(viewAngleTop())); connect(toolBar->buttonBottom, SIGNAL(clicked()), this, SLOT(viewAngleBottom())); connect(toolBar->buttonLeft, SIGNAL(clicked()), this, SLOT(viewAngleLeft())); connect(toolBar->buttonRight, SIGNAL(clicked()), this, SLOT(viewAngleRight())); connect(toolBar->buttonFront, SIGNAL(clicked()), this, SLOT(viewAngleFront())); - connect(toolBar->buttonBack, SIGNAL(clicked()), this, SLOT(viewAngleBack())); - - toolBar->setStyleSheet("QToolBar{background-color:black;}" - "QToolButton:hover{background-color:green;}"); + 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())); + + toolBar->setStyleSheet("QToolBar{border:1 solid black;}" ); + // "QToolButton:hover{background-color:green;}"); + //std::cout<< toolBar->palette().background().color().name().toStdString()<palette().background().color().lightness()<setChecked(settings.value("view/hideEditor").toBool()); hideEditor(); + toolBarActionHide->setChecked(settings.value("view/hideToolbar").toBool()); + hideToolbar(); updateMdiMode(settings.value("advanced/mdi").toBool()); updateUndockMode(settings.value("advanced/undockableWindows").toBool()); } @@ -2222,8 +2237,10 @@ void MainWindow::hideToolbar() { if(toolBarActionHide->isChecked()){ toolBar->hide(); + editortoolbar->hide(); } else { toolBar->show(); + editortoolbar->show(); } } diff --git a/src/toolbar.cpp b/src/toolbar.cpp index 061a09c2..5462f9f9 100644 --- a/src/toolbar.cpp +++ b/src/toolbar.cpp @@ -3,39 +3,47 @@ ToolBar::ToolBar(QWidget *parent) : QToolBar(parent) { - buttonNew = new QToolButton; - buttonNew->setIcon(QIcon("://images/Document-New-128.png")); - - buttonOpen = new QToolButton; - buttonOpen->setIcon(QIcon("://images/Open-128.png")); - - buttonSave = new QToolButton; - buttonSave->setIcon(QIcon("://images/Save-128.png")); - + int defaultColor = this->palette().background().color().lightness(); + buttonRender = new QToolButton; - buttonRender->setIcon(QIcon("://images/Arrowhead-Right-32.png")); - buttonTop = new QToolButton; - buttonTop->setIcon(QIcon("://images/up.png")); - buttonBottom = new QToolButton; - buttonBottom->setIcon(QIcon("://images/bottom.png")); - buttonLeft = new QToolButton; - buttonLeft->setIcon(QIcon("://images/left.png")); - buttonRight = new QToolButton; - buttonRight->setIcon(QIcon("://images/right.png")); - buttonFront = new QToolButton; - buttonFront->setIcon(QIcon("://images/front.png")); - buttonBack = new QToolButton; - buttonBack->setIcon(QIcon("://images/back.png")); + buttonAxes = new QAction(this); + buttonEdges = new QToolButton; + buttonZoomIn = new QToolButton; + buttonZoomOut = new QToolButton; + + if(defaultColor > 165) + { + buttonRender->setIcon(QIcon("://images/blackRender.png")); + 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")); + } else { + + buttonRender->setIcon(QIcon("://images/Arrowhead-Right-32.png")); + buttonTop->setIcon(QIcon("://images/up.png")); + buttonBottom->setIcon(QIcon("://images/bottom.png")); + buttonLeft->setIcon(QIcon("://images/left.png")); + 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")); + + } - this->addWidget(buttonNew); - this->addWidget(buttonOpen); - this->addWidget(buttonSave); this->addWidget(buttonRender); this->addSeparator(); this->addWidget(buttonTop); @@ -44,5 +52,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); } diff --git a/src/toolbar.h b/src/toolbar.h index a743d6ff..7777876a 100644 --- a/src/toolbar.h +++ b/src/toolbar.h @@ -3,15 +3,16 @@ #include #include +#include class ToolBar : public QToolBar { Q_OBJECT public: explicit ToolBar(QWidget *parent = 0); - QToolButton *buttonNew, *buttonOpen, *buttonSave, *buttonRender; + QToolButton *buttonZoomIn, *buttonZoomOut, *buttonRender; QToolButton *buttonTop, *buttonBottom, *buttonLeft, *buttonRight; - QToolButton *buttonFront, *buttonBack; - + QToolButton *buttonFront, *buttonBack, *buttonEdges; + QAction *buttonAxes; signals: public slots: