From 8e3b3e1919b902ff24586152c8c3621981bcf487 Mon Sep 17 00:00:00 2001 From: shaina7837 Date: Sat, 28 Jun 2014 20:07:12 +0530 Subject: [PATCH] added few more icons with tool tips --- images/blackback.png | Bin 1053 -> 889 bytes images/blackfront.png | Bin 1071 -> 864 bytes images/surface.png | Bin 0 -> 1444 bytes images/wireframe1.png | Bin 0 -> 922 bytes openscad.qrc | 2 ++ src/MainWindow.h | 1 + src/editortoolbar.cpp | 18 ++++++++++++++---- src/mainwin.cc | 33 +++++++++++++++++++++------------ src/toolbar.cpp | 30 ++++++++++++++++++++---------- src/toolbar.h | 4 ++-- 10 files changed, 60 insertions(+), 28 deletions(-) create mode 100644 images/surface.png create mode 100644 images/wireframe1.png diff --git a/images/blackback.png b/images/blackback.png index e3c021fcda6ca5a2e0de7bab57788f26eebde46d..3f9fcea262d0edb11a76e21db994983b24c9af37 100644 GIT binary patch delta 819 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 Y#1sEA01hF`4FCWD07*qoM6N<$f|Yf5)&Kwi delta 1002 zcmV2CoQ^Q-2u+J2YK<<17FG1H4H@K~z}7?N(iABUKnZGnv1HbSc4xO^YoW z>nfcL$wF#Md~J`y1VK=8x!kLSkWo$3 zo}ws9XBg&7n}5yremoxk`p5<*CMM|l`T72xot<$)NG|{|43pwGF4ErK{^{J@obuQB za5zlMvV1{NlyO4H^Je@HJkLkmZujTWXjE;;fFwy*6-BuL04&S?YO~qih{xmi>p8JN zAaK51F5gjARRRE>=RZs)lVbjG`#-8HUl!^ZcaK>Fi9UQWslWTUYj_V*z{xAPv9;;Bltj-(_iO zX&u0u{r&y#=5o0(A!M{#tzH2Di^Z~TwOZeHxm+``SgiOrX~F;u0N2cQJKgBR5sSr& zvMf&q0)cZDi)EeTxZk_GyE|oBo;*Yx0ImSI(|=G6)WXcnj0Qjhpv}(CYIRV$0EhtQ zkHtVENT<_504a0%lX(p<0swOo2HbAl>BLXK#B%_a8-53LUAG-ov0N_O z0YFt%9>5a-zOCB;MNwq{*x1-u5JmA;Fc^HMUg2Oc__QdBQ)_E$-vdCgSmXfg0*Kdb zpns#IhOs}r44wzjoWOlg(&-0OLwfYWC(*nz~*Q(X(xTa}dvw3|Z2tvf` z_0COCPwN2g1Na5NrGGS#m|bqnoC~;pS7WBKEE~1k?U9w0mGAax6ab6?xO*%kStt~0 z-P+o^ObB@m0L`-OZHL1#wYa#LJs|v901pAQ1IYXrbLYrG)qfIr2%y_6z6+=G|0!zW YPfzN4AFAM3q5uE@07*qoM6N<$g05Zc@&Et; diff --git a/images/surface.png b/images/surface.png new file mode 100644 index 0000000000000000000000000000000000000000..7839cecb26c665f6f730a51a741dd95e79971d55 GIT binary patch literal 1444 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 literal 0 HcmV?d00001 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: