vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

toolbar set

master
shaina7837 2014-09-14 19:51:40 +02:00 committed by Torsten Paul
parent 5252bae1f9
commit 7345de27b1
20 changed files with 175 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Arrowhead-Right-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
Document-New-128.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 64 KiB

BIN
Open-128.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 64 KiB

BIN
Save-128.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 64 KiB

BIN
axes.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 463 B

BIN
back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 955 B

BIN
bottom.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 885 B

BIN
down.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
grid.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 641 B

BIN
left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 910 B

BIN
openscad.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 884 B

6
openscad.pro
View File

@ -306,7 +306,8 @@ src/FontCache.h \
src/CsgInfo.h \
\
src/AutoUpdater.h \
src/legacyeditor.h
src/legacyeditor.h \
src/scadlexer.h
SOURCES += src/version_check.cc \
src/ProgressWidget.cc \
@ -393,7 +394,8 @@ src/FontCache.cc \
src/openscad.cc \
src/mainwin.cc \
src/FontListDialog.cc \
src/legacyeditor.cc
src/legacyeditor.cc \
src/scadlexer.cpp
# ClipperLib
SOURCES += src/polyclipping/clipper.cpp

2
openscad.pro.user
View File

@ -170,7 +170,7 @@
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">openscad</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/shaina/letsbegin/openscad/openscad.pro</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/shaina/openscad/openscad.pro</value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">openscad.pro</value>
<value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>

34
openscad.qrc
View File

@ -1,12 +1,26 @@
<RCC>
<qresource prefix="/">
<file>icons/prefsFeatures.png</file>
<file>icons/stopbutton.png</file>
<file>icons/prefsAdvanced.png</file>
<file>icons/prefs3DView.png</file>
<file>icons/prefsEditor.png</file>
<file>icons/prefsUpdate.png</file>
<file>icons/flattr.png</file>
<file>src/AboutDialog.html</file>
</qresource>
<qresource prefix="/">
<file>icons/prefsFeatures.png</file>
<file>icons/stopbutton.png</file>
<file>icons/prefsAdvanced.png</file>
<file>icons/prefs3DView.png</file>
<file>icons/prefsEditor.png</file>
<file>icons/prefsUpdate.png</file>
<file>icons/flattr.png</file>
<file>src/AboutDialog.html</file>
<file>Arrowhead-Right-32.png</file>
<file>axes.png</file>
<file>back.png</file>
<file>bottom.png</file>
<file>Document-New-128.png</file>
<file>down.png</file>
<file>front.png</file>
<file>grid.png</file>
<file>left.png</file>
<file>Open-128.png</file>
<file>openscad.png</file>
<file>right.png</file>
<file>Save-128.png</file>
<file>up.png</file>
</qresource>
</RCC>

BIN
right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 882 B

1
src/MainWindow.h
View File

@ -137,6 +137,7 @@ private slots:
void pasteViewportRotation();
void hideEditor();
void preferences();
void hideToolbar();
private slots:
void selectFindType(int);

138
src/MainWindow.ui
View File

@ -15,7 +15,16 @@
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
@ -30,7 +39,16 @@
<string notr="true"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
@ -64,7 +82,16 @@
<number>0</number>
</property>
<layout class="QHBoxLayout" name="horizontalLayoutAnimate">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
@ -120,7 +147,7 @@
<x>0</x>
<y>0</y>
<width>936</width>
<height>22</height>
<height>25</height>
</rect>
</property>
<widget class="QMenu" name="menu_File">
@ -243,6 +270,7 @@
<addaction name="viewActionPerspective"/>
<addaction name="viewActionOrthogonal"/>
<addaction name="separator"/>
<addaction name="toolBarActionHide"/>
<addaction name="editActionHide"/>
<addaction name="viewActionHide"/>
</widget>
@ -270,7 +298,16 @@
</attribute>
<widget class="QWidget" name="editorDockContents">
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item alignment="Qt::AlignTop">
@ -378,7 +415,16 @@
</attribute>
<widget class="QWidget" name="consoleDockContents">
<layout class="QVBoxLayout" name="verticalLayout_5">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
@ -394,7 +440,35 @@
</layout>
</widget>
</widget>
<widget class="QToolBar" name="toolBar">
<property name="windowTitle">
<string>toolBar</string>
</property>
<attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
<addaction name="fileActionNew"/>
<addaction name="fileActionOpen"/>
<addaction name="fileActionSave"/>
<addaction name="designActionRender"/>
<addaction name="separator"/>
<addaction name="viewActionTop"/>
<addaction name="viewActionBottom"/>
<addaction name="viewActionLeft"/>
<addaction name="viewActionRight"/>
<addaction name="viewActionFront"/>
<addaction name="viewActionBack"/>
<addaction name="viewActionShowEdges"/>
<addaction name="viewActionShowAxes"/>
</widget>
<action name="fileActionNew">
<property name="icon">
<iconset resource="../openscad.qrc">
<normaloff>:/Document-New-128.png</normaloff>:/Document-New-128.png</iconset>
</property>
<property name="text">
<string>&amp;New</string>
</property>
@ -403,6 +477,10 @@
</property>
</action>
<action name="fileActionOpen">
<property name="icon">
<iconset resource="../openscad.qrc">
<normaloff>:/Open-128.png</normaloff>:/Open-128.png</iconset>
</property>
<property name="text">
<string>&amp;Open...</string>
</property>
@ -411,6 +489,10 @@
</property>
</action>
<action name="fileActionSave">
<property name="icon">
<iconset resource="../openscad.qrc">
<normaloff>:/Save-128.png</normaloff>:/Save-128.png</iconset>
</property>
<property name="text">
<string>&amp;Save</string>
</property>
@ -583,6 +665,10 @@
</property>
</action>
<action name="designActionRender">
<property name="icon">
<iconset resource="../openscad.qrc">
<normaloff>:/Arrowhead-Right-32.png</normaloff>:/Arrowhead-Right-32.png</iconset>
</property>
<property name="text">
<string>&amp;Render</string>
</property>
@ -668,6 +754,10 @@
<property name="checkable">
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../openscad.qrc">
<normaloff>:/grid.png</normaloff>:/grid.png</iconset>
</property>
<property name="text">
<string>Show Edges</string>
</property>
@ -679,6 +769,10 @@
<property name="checkable">
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../openscad.qrc">
<normaloff>:/axes.png</normaloff>:/axes.png</iconset>
</property>
<property name="text">
<string>Show Axes</string>
</property>
@ -706,6 +800,10 @@
</property>
</action>
<action name="viewActionTop">
<property name="icon">
<iconset resource="../openscad.qrc">
<normaloff>:/up.png</normaloff>:/up.png</iconset>
</property>
<property name="text">
<string>Top</string>
</property>
@ -714,6 +812,10 @@
</property>
</action>
<action name="viewActionBottom">
<property name="icon">
<iconset resource="../openscad.qrc">
<normaloff>:/bottom.png</normaloff>:/bottom.png</iconset>
</property>
<property name="text">
<string>Bottom</string>
</property>
@ -722,6 +824,10 @@
</property>
</action>
<action name="viewActionLeft">
<property name="icon">
<iconset resource="../openscad.qrc">
<normaloff>:/left.png</normaloff>:/left.png</iconset>
</property>
<property name="text">
<string>Left</string>
</property>
@ -730,6 +836,10 @@
</property>
</action>
<action name="viewActionRight">
<property name="icon">
<iconset resource="../openscad.qrc">
<normaloff>:/right.png</normaloff>:/right.png</iconset>
</property>
<property name="text">
<string>Right</string>
</property>
@ -738,6 +848,10 @@
</property>
</action>
<action name="viewActionFront">
<property name="icon">
<iconset resource="../openscad.qrc">
<normaloff>:/front.png</normaloff>:/front.png</iconset>
</property>
<property name="text">
<string>Front</string>
</property>
@ -746,6 +860,10 @@
</property>
</action>
<action name="viewActionBack">
<property name="icon">
<iconset resource="../openscad.qrc">
<normaloff>:/back.png</normaloff>:/back.png</iconset>
</property>
<property name="text">
<string>Back</string>
</property>
@ -953,6 +1071,14 @@
<string>View All</string>
</property>
</action>
<action name="toolBarActionHide">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Hide Toolbar</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>

14
src/mainwin.cc
View File

@ -387,6 +387,7 @@ MainWindow::MainWindow(const QString &filename)
connect(this->viewActionViewAll, SIGNAL(triggered()), this, SLOT(viewAll()));
connect(this->viewActionPerspective, SIGNAL(triggered()), this, SLOT(viewPerspective()));
connect(this->viewActionOrthogonal, SIGNAL(triggered()), this, SLOT(viewOrthogonal()));
connect(this->toolBarActionHide, SIGNAL(triggered()), this, SLOT(hideToolbar()));
connect(this->viewActionHide, SIGNAL(triggered()), this, SLOT(hideConsole()));
connect(this->viewActionZoomIn, SIGNAL(triggered()), qglview, SLOT(ZoomIn()));
connect(this->viewActionZoomOut, SIGNAL(triggered()), qglview, SLOT(ZoomOut()));
@ -443,7 +444,8 @@ MainWindow::MainWindow(const QString &filename)
connect(this->replaceButton, SIGNAL(clicked()), this, SLOT(replace()));
connect(this->replaceAllButton, SIGNAL(clicked()), this, SLOT(replaceAll()));
connect(this->replaceInputField, SIGNAL(returnPressed()), this->replaceButton, SLOT(animateClick()));
toolBar->setStyleSheet("QToolBar{background-color:black;}");
// make sure it looks nice..
QSettings settings;
QByteArray windowState = settings.value("window/state", QByteArray()).toByteArray();
@ -2198,6 +2200,15 @@ void MainWindow::setDockWidgetTitle(QDockWidget *dockWidget, QString prefix, boo
dockWidget->setWindowTitle(title);
}
void MainWindow::hideToolbar()
{
if(toolBarActionHide->isChecked()){
toolBar->hide();
} else {
toolBar->show();
}
}
void MainWindow::hideEditor()
{
if (editActionHide->isChecked()) {
@ -2208,6 +2219,7 @@ void MainWindow::hideEditor()
}
void MainWindow::hideConsole()
{
if (viewActionHide->isChecked()) {
consoleDock->hide();

BIN
up.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 884 B