mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-06 00:06:00 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

--User changes

Browse Source 
Implement copying and pasting xforms between flames.

--Code changes
 Make palette filename be a shared_ptr<string> to avoid duplication.
 Ensure random seeds in RendererCL have no duplicates and are not zero.
This commit is contained in:
mfeemster
2015-05-19 19:31:33 -07:00
parent 48ccce69f6
commit cb54605878
9 changed files with 106 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Source/Fractorium/Fractorium.ui
View File

@ -170,6 +170,9 @@
<addaction name="ActionCopyAllXml"/>
<addaction name="ActionPasteXmlAppend"/>
<addaction name="ActionPasteXmlOver"/>
<addaction name="separator"/>
<addaction name="ActionCopySelectedXforms"/>
<addaction name="ActionPasteSelectedXforms"/>
</widget>
<addaction name="MenuFile"/>
<addaction name="MenuEdit"/>
@ -6104,7 +6107,7 @@ SpinBox
<normaloff>:/Fractorium/Icons/page_paste.png</normaloff>:/Fractorium/Icons/page_paste.png</iconset>
</property>
<property name="text">
<string>Paste Xml &amp;Append</string>
<string>Paste Xml A&amp;ppend</string>
</property>
<property name="shortcut">
<string>Ctrl+V</string>
@ -6139,6 +6142,28 @@ SpinBox
<string>Fl&amp;ip</string>
</property>
</action>
<action name="ActionCopySelectedXforms">
<property name="text">
<string>Copy Selected &amp;Xforms</string>
</property>
<property name="toolTip">
<string>Copy selected xforms to the clipboard</string>
</property>
<property name="shortcut">
<string>Ctrl+Q</string>
</property>
</action>
<action name="ActionPasteSelectedXforms">
<property name="text">
<string>Paste Selected X&amp;forms</string>
</property>
<property name="toolTip">
<string>Paste copied xforms into the current flame</string>
</property>
<property name="shortcut">
<string>Ctrl+W</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>