instantiate

monsterkodi · Jul 6, 2018 · 0e4aab6 · 0e4aab6
1 parent 485ac2d
commit 0e4aab6
Show file tree

Hide file tree

Showing 9 changed files with 448 additions and 13 deletions.
diff --git a/coffee/edit/points.coffee b/coffee/edit/points.coffee
@@ -343,7 +343,7 @@ class Points extends Convert
     # 000        000   000  000  000  0000     000          000  
     # 000         0000000   000  000   000     000     0000000   
 
-    @isFakeItem: (item) -> item.type in ['circle', 'ellipse', 'rect', 'text', 'image']
+    @isFakeItem: (item) -> item.type in ['circle', 'ellipse', 'rect', 'text', 'image', 'use']
     isFake: -> Points.isFakeItem @item
     isPoly: -> @item.type in ['polygon', 'polyline', 'line', 'circle', 'ellipse', 'rect', 'text', 'image']
     isPath: -> @item.type == 'path'

diff --git a/coffee/kali.coffee b/coffee/kali.coffee
@@ -149,6 +149,7 @@ class Kali
             when 'Lock'             then return post.emit 'tool', 'button', 'lock', 'lock'
             when 'Unlock'           then return post.emit 'tool', 'button', 'lock', 'unlock'
 
+            when 'Instantiate'      then return @stage.instantiate()
             when 'Group'            then return post.emit 'tool', 'group'
             when 'Ungroup'          then return post.emit 'tool', 'ungroup'
 

diff --git a/coffee/menu.noon b/coffee/menu.noon
@@ -72,7 +72,7 @@ Edit
         Back                alt+ctrl+down
     Select      
         All                 ctrl+a a
-        None                ctrl+d d
+        None                ctrl+shift+a ctrl+d d
         Invert              ctrl+i i
         -      
         Select Groups       alt+g
@@ -90,6 +90,7 @@ Edit
     --          
     Group                   ctrl+g g
     Ungroup                 ctrl+u u
+    Instantiate             alt+i                  
     ---          
     Cut                     ctrl+x x
     Copy                    ctrl+c c

diff --git a/coffee/stage.coffee b/coffee/stage.coffee
@@ -889,7 +889,28 @@ class Stage
                 else
                     log 'dafuk? empty?', svg?
 
+    # 000  000   000   0000000  000000000   0000000   000   000  000000000  000   0000000   000000000  00000000  
+    # 000  0000  000  000          000     000   000  0000  000     000     000  000   000     000     000       
+    # 000  000 0 000  0000000      000     000000000  000 0 000     000     000  000000000     000     0000000   
+    # 000  000  0000       000     000     000   000  000  0000     000     000  000   000     000     000       
+    # 000  000   000  0000000      000     000   000  000   000     000     000  000   000     000     00000000  
+
+    instantiate: ->
+
+        sortedItems = @sortedSelectedItems()
+
+        if sortedItems.length > 1
+            @group()
+            @defs()
+            return
+
+        item = first sortedItems
 
+        @do()
+        instance = @activeLayer().use(item)
+        @selection.setItems [instance]
+        @done()
+
     # 000       0000000    0000000   0000000    
     # 000      000   000  000   000  000   000  
     # 000      000   000  000000000  000   000  

diff --git a/coffee/tool/group.coffee b/coffee/tool/group.coffee
@@ -42,7 +42,7 @@ class Group extends Tool
     # 0000000      000     000000000  000  0000  0000000     
     #      000     000     000   000  000   000  000         
     # 0000000      000     000   000   0000000   00000000    
-
+        
     #  0000000   00000000    0000000   000   000  00000000   
     # 000        000   000  000   000  000   000  000   000  
     # 000  0000  0000000    000   000  000   000  00000000   

diff --git a/coffee/tool/select.coffee b/coffee/tool/select.coffee
@@ -50,7 +50,7 @@ class Select extends Tool
             action: => @setShapeText 'shape-text'
         ,
             name:   'text'
-            tiny:   'select-text'
+            tiny:   'text'
             choice: @shapeText
             action: => @setShapeText 'text'
         ]

diff --git a/package.noon b/package.noon
@@ -1,6 +1,6 @@
 name            kaligraf
 productName     kaligraf
-version         0.42.0
+version         0.43.0
 description     svg editor
 main            js/app.js
 author          monsterkodi

diff --git a/svg/test/test.svg b/svg/test/test.svg