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

Merge branch 'toolbar' of https://github.com/openscad/openscad into gui-updates 

Conflicts:
	openscad.qrc
	src/MainWindow.ui
master
Torsten Paul 2015-01-09 19:09:22 +01:00
parent 5943704194 1ba2216108
commit ceae9d57d0
7 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
images/Command-Redo-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
images/Command-Reset-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
images/Command-Undo-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
images/Decrease-Indent-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
images/Increase-Indent-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

5
openscad.qrc
View File

@ -1,5 +1,10 @@
<RCC>
<qresource prefix="/">
<file>images/Command-Redo-32.png</file>
<file>images/Command-Reset-32.png</file>
<file>images/Command-Undo-32.png</file>
<file>images/Decrease-Indent-32.png</file>
<file>images/Increase-Indent-32.png</file>
<file>icons/close.png</file>
<file>icons/information-icons-error.png</file>
<file>icons/information-icons-info.png</file>

41
src/MainWindow.ui
View File

@ -403,10 +403,15 @@
<addaction name="fileActionOpen"/>
<addaction name="fileActionSave"/>
<addaction name="separator"/>
<addaction name="editActionUndo"/>
<addaction name="editActionRedo"/>
<addaction name="editActionIndent"/>
<addaction name="editActionUnindent"/>
<addaction name="designActionPreview"/>
<addaction name="designActionRender"/>
<addaction name="separator"/>
<addaction name="designActionExportSTL"/>
<addaction name="viewActionResetView"/>
</widget>
</item>
<item>
@ -600,6 +605,10 @@
</property>
</action>
<action name="editActionUndo">
<property name="icon">
<iconset resource="../openscad.qrc">
<normaloff>:/images/Command-Undo-32.png</normaloff>:/images/Command-Undo-32.png</iconset>
</property>
<property name="text">
<string>&amp;Undo</string>
</property>
@ -611,6 +620,10 @@
</property>
</action>
<action name="editActionRedo">
<property name="icon">
<iconset resource="../openscad.qrc">
<normaloff>:/images/Command-Redo-32.png</normaloff>:/images/Command-Redo-32.png</iconset>
</property>
<property name="text">
<string>&amp;Redo</string>
</property>
@ -655,6 +668,10 @@
</property>
</action>
<action name="editActionIndent">
<property name="icon">
<iconset resource="../openscad.qrc">
<normaloff>:/images/Increase-Indent-32.png</normaloff>:/images/Increase-Indent-32.png</iconset>
</property>
<property name="text">
<string>&amp;Indent</string>
</property>
@ -662,14 +679,6 @@
<string>Ctrl+I</string>
</property>
</action>
<action name="editActionUnindent">
<property name="text">
<string>U&amp;nindent</string>
</property>
<property name="shortcut">
<string>Ctrl+Shift+I</string>
</property>
</action>
<action name="editActionComment">
<property name="text">
<string>C&amp;omment</string>
@ -1136,6 +1145,10 @@
</property>
</action>
<action name="viewActionResetView">
<property name="icon">
<iconset resource="../openscad.qrc">
<normaloff>:/images/Command-Reset-32.png</normaloff>:/images/Command-Reset-32.png</iconset>
</property>
<property name="text">
<string>Reset View</string>
</property>
@ -1201,6 +1214,18 @@
<string>Hide toolbars</string>
</property>
</action>
<action name="editActionUnindent">
<property name="icon">
<iconset resource="../openscad.qrc">
<normaloff>:/images/Decrease-Indent-32.png</normaloff>:/images/Decrease-Indent-32.png</iconset>
</property>
<property name="text">
<string>U&amp;nindent</string>
</property>
<property name="shortcut">
<string>Ctrl+Shift+I</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>