Commit: 154f0bd01547d6579da0bfcc6a7fd9cd100ab2fb - wmxmled (git)

wxPythonで作った簡易XMLエディタ

Commit MetaInfo

• Revisão: 154f0bd01547d6579da0bfcc6a7fd9cd100ab2fb (tree)
• Hora: 2014-04-10 01:40:46
• Autor: tamanegi <tamanegi@user...>
• Commiter: tamanegi

Mensagem de Log

implement multiple cut copy paste

Mudança Sumário

• modified: README
• modified: wmutils.py
• modified: wmxmled.conf
• modified: wmxmled.fbp
• modified: wmxmled.py
• modified: wmxmled.xrc

Diff

--- a/README
+++ b/README
@@ -2,10 +2,12 @@ wmxmled.py: simple xml editor by wxPython
 
 TODO
 * test on other platforms (now tested only on Linux-GTK env.)
-* add wm3D specific functions
-* implement multiple delete, copy, cut
+* add wm3d specific functions
+* about information
+* code refactoring
 
 CHANGELOG
+2014/04/09: implement and improve multiple copy, cut, delete functions
 2014/04/07: fix and improve undo functions (paste, del, add)
 2014/03/14: read file from command line argument
             fix bug on removing attributes

--- a/wmutils.py
+++ b/wmutils.py
@@ -132,8 +132,7 @@ class WMXmlEditorParams:
   TC_showattr_value = False # active only when showattr_name is True
 
   # undo/redo settings
-  UNDO_truncate_queue_wo_query = True
-  UNDO_queue_size = 5
+  UNDO_queue_size = 15
 
   # find settings
   FIND_clear_wo_query = True
@@ -314,6 +313,39 @@ class ActionAdd( Action ):
   def reverse( self ):
     return ActionDel( self.uniqids, self.pos, self.itemid, self.myxml )
 
+class ActionAdds( Action ):
+  def __init__( self, uniqids = None, pos = None, itemids = None, myxmls = None ):
+    Action.__init__( self )
+    if len(myxmls) > 0:
+      self.initialize( uniqids, pos, itemids, myxmls )
+
+  def initialize( self, uniqids, pos, itemids, myxmls ):
+    mylen = len( uniqids )
+    self.myadds = []
+    # length shall be same
+    #if len(pos) != mylen or len(itemids) != mylen or len(myxmls) != mylen:
+    if len(itemids) != mylen or len(myxmls) != mylen:
+      return
+    for i in range( 0, mylen ):
+      self.myadds.append( ActionAdd( uniqids[i], 0, itemids[i], myxmls[i] ) )
+
+  def undo( self, treectrl, wmxmled ):
+    self.myadds.reverse()
+    for myadd in self.myadds:
+      myadd.undo( treectrl, wmxmled )
+    return True
+
+  def reverse( self ):
+    uniqids = []
+    pos = []
+    itemids = []
+    myxmls = []
+    for myadd in self.myadds:
+      uniqids.append( myadd.uniqids )
+      pos.append( myadd.pos )
+      myxmls.append( myadd.myxml )
+    return ActionDels( uniqids, pos, itemids, myxmls )
+
 # delete action; reversed action is add
 class ActionDel( Action ):
   def __init__( self, uniqids = None, pos = None, itemid = None, myxml = None ):
@@ -357,3 +389,39 @@ class ActionDel( Action ):
 
   def reverse( self ):
     return ActionAdd( self.uniqids, self.pos, self.itemid, self.myxml )
+
+# multiple deletes
+# registered actions should not be nested
+class ActionDels( Action ):
+  def __init__( self, uniqids = None, pos = None, itemids = None, myxmls = None ):
+    Action.__init__( self )
+    if len(myxmls) > 0:
+      self.initialize( uniqids, pos, itemids, myxmls )
+
+  def initialize( self, uniqids, pos, itemids, myxmls ):
+    mylen = len( uniqids )
+    self.mydels = []
+    # lengths shall be same
+    #if len(pos) != mylen or len(itemids) != mylen or len(myxmls) != mylen:
+    if len(pos) != mylen or len(myxmls) != mylen:
+      return
+    for i in range( 0, mylen ):
+      self.mydels.append( ActionDel( uniqids[i], pos[i], None, myxmls[i] ) )
+
+  def undo( self, treectrl, wmxmled ):
+    self.mydels.reverse()
+    for mydel in self.mydels:
+      mydel.undo( treectrl, wmxmled )
+    return True
+
+  def reverse( self ):
+    uniqids = []
+    pos = []
+    itemids = []
+    myxmls = []
+    for mydel in self.mydels:
+      uniqids.append( mydel.uniqids )
+      pos.append( mydel.pos )
+      itemids.append( mydel.itemid )
+      myxmls.append( mydel.myxml )
+    return ActionAdds( uniqids, pos, itemids, myxmls )

--- a/wmxmled.conf
+++ b/wmxmled.conf
@@ -1,7 +1,7 @@
 <wmconf>
   <!-- sample configuration file -->
   <!-- the following values are equivalent to values in wmutils.py -->
-  <undo no_query_trunc="1" qsize="15" />
+  <undo qsize="15" />
   <find clear_wo_query="1" />
   <tc showattr_name="1" showattr_value="1" />
   <lc emphasis="blue" indent="2" />

--- a/wmxmled.fbp
+++ b/wmxmled.fbp
@@ -600,21 +600,6 @@
                     <event name="OnMenuSelection"></event>
                     <event name="OnUpdateUI"></event>
                 </object>
-                <object class="wxMenuItem" expanded="1">
-                    <property name="bitmap"></property>
-                    <property name="checked">0</property>
-                    <property name="enabled">1</property>
-                    <property name="help"></property>
-                    <property name="id">wxID_ANY</property>
-                    <property name="kind">wxITEM_NORMAL</property>
-                    <property name="label">Delete Selected</property>
-                    <property name="name">rightClickMenuDeleteSelected</property>
-                    <property name="permission">none</property>
-                    <property name="shortcut"></property>
-                    <property name="unchecked_bitmap"></property>
-                    <event name="OnMenuSelection"></event>
-                    <event name="OnUpdateUI"></event>
-                </object>
                 <object class="separator" expanded="0">
                     <property name="name">m_separator6</property>
                     <property name="permission">none</property>

--- a/wmxmled.py
+++ b/wmxmled.py
@@ -108,7 +108,6 @@ class WMXmlEditor( wx.App ):
     self.Bind( wx.EVT_MENU, self.evPopupMenuPasteA, id=xrc.XRCID("rightClickMenuPasteAppend") )
     self.Bind( wx.EVT_MENU, self.evPopupMenuPasteAC, id=xrc.XRCID("rightClickMenuPasteAppendChild") )
     self.Bind( wx.EVT_MENU, self.evPopupMenuDelete, id=xrc.XRCID("rightClickMenuDelete") )
-    self.Bind( wx.EVT_MENU, self.evPopupMenuDeleteSelected, id=xrc.XRCID("rightClickMenuDeleteSelected") )
     self.Bind( wx.EVT_MENU, self.evPopupMenuInsert, id=xrc.XRCID("rightClickMenuInsert") )
     self.Bind( wx.EVT_MENU, self.evPopupMenuInsertChild, id=xrc.XRCID("rightClickMenuInsertChild") )
     self.Bind( wx.EVT_MENU, self.evPopupMenuAppend, id=xrc.XRCID("rightClickMenuAppend") )
@@ -608,6 +607,8 @@ class WMXmlEditor( wx.App ):
     if not self.lc.IsSelected( index ):
       return
     self.lc_editing_index = index
+    self.lc_editing_indexes = self.listCtrlGetSelectedIndexes()
+    numselected = len( self.lc_editing_indexes )
     ctrl = wx.GetKeyState( wx.WXK_CONTROL )
     if keycode == 3: # Ctrl-C; copy
       self.evPopupMenuCopy( None )
@@ -1067,7 +1068,6 @@ class WMXmlEditor( wx.App ):
     if self.copybuffer is None:
       self.rightClickMenu.FindItemById(xrc.XRCID("rightClickMenuPaste")).Enable( False )
     self.rightClickMenu.FindItemById(xrc.XRCID("rightClickMenuDelete")).Enable( activate )
-    self.rightClickMenu.FindItemById(xrc.XRCID("rightClickMenuDeleteSelected")).Enable( activate )
     self.rightClickMenu.FindItemById(xrc.XRCID("rightClickMenuInsert")).Enable( True )
     self.rightClickMenu.FindItemById(xrc.XRCID("rightClickMenuInsertChild")).Enable( True )
     self.rightClickMenu.FindItemById(xrc.XRCID("rightClickMenuAppend")).Enable( True )
@@ -1087,11 +1087,21 @@ class WMXmlEditor( wx.App ):
   def evPopupMenuCopy( self, event ):
     if not self.popupIsItemAvailable( self.lc_editing_index ):
       return
+    self.copybuffer = []
+    self.removeNestedIndexes()
+    if len( self.lc_editing_indexes ) > 1: # multiple
+      for myindex in self.lc_editing_indexes:
+        self.lc_editing_index = myindex
+        self.copybuffer.append( self.workerCopy() )
+    else: # single copy
+      self.copybuffer = [ self.workerCopy() ]
+
+  def workerCopy( self ):
     myindex = min( self.lc_editing_index, self.l2l_correspondence[self.lc_editing_index] )
-    treeitemid = self.l2t_correspondence[myindex]
+    itemid = self.l2t_correspondence[myindex]
     # uniqids will be discarded
-    self.copybuffer, uniqids = self.createElementTreeFromTreeCtrl( treeitemid )
-    self.copybuffer = self.copybuffer.getroot()
+    buf, uniqids = self.createElementTreeFromTreeCtrl( itemid )
+    return buf.getroot()
 
   def evPopupMenuCut( self, event ):
     if not self.popupIsItemAvailable( self.lc_editing_index ):
@@ -1113,69 +1123,131 @@ class WMXmlEditor( wx.App ):
     self.evPopupMenuPaste( event, False, True )
 
   def evPopupMenuPaste( self, event, insert = True, child = True ):
+    # brief check
     if self.copybuffer is None:
       self.miscShowMessageBox( "no data in buffer" )
       return
-    newxml = copy.deepcopy( self.copybuffer )
-    showname = self.createTreeCtrlLabel( newxml )
+    if len( self.copybuffer ) == 0:
+      self.miscShowMessageBox( "no data in buffer" )
+      return
+    # prepare TreeCtrl labels
+    newxmls = copy.deepcopy( self.copybuffer )
+    names = []
+    for newxml in newxmls:
+      names.append( self.createTreeCtrlLabel( newxml ) )
+    numadd = len( names )
+    # get ListCtrl index
     if len( self.l2l_correspondence ) > 0:
       index = min( self.lc_editing_index, self.l2l_correspondence[self.lc_editing_index] )
     else:
       index = -1
+
+    if insert:
+      names.reverse()
+      newxmls.reverse()
+
+    # add xml in copybuffer
+    my_itemids = []
     if index >= 0:
-      treeitemid = self.l2t_correspondence[index]
+      itemid = self.l2t_correspondence[index]
     if index < 0 and child: # i do not know what to do
       self.miscShowMessageBox( "cannot create child element." )
       return
     elif index < 0 and self.tc.IsEmpty(): # add root element
-      my_itemid = self.tc.AddRoot( showname, self.imageFolder, self.imageFolderOpen )
+      if numadd > 1:
+        self.miscShowMessageBox( "cannot add multiple root element." )
+        return
+      my_itemids.append( self.tc.AddRoot( names[0], self.imageFolder, self.imageFolderOpen ) )
     else:
       if insert and child: # insert child
-        my_itemid = self.insertChildElement( showname, treeitemid )
+        for name in names:
+          my_itemids.append( self.insertChildElement( name, itemid ) )
       elif insert and not child: # insert
         if index == 0:
           self.miscShowMessageBox("Cannot insert another root element.")
           return
         else:
-          my_itemid = self.insertElement( showname, treeitemid )
+          my_itemids.append( self.insertElement( names[0], itemid ) )
+          for i in range( 1, numadd ):
+            my_itemids.append( self.insertElement( names[i], my_itemids[-1] ) )
       elif not insert and child: # append child
-        my_itemid = self.appendChildElement( showname, treeitemid )
+        for name in names:
+          my_itemids.append( self.appendChildElement( names[i], itemid ) )
       elif not insert and not child: # append
         if index == 0:
           self.miscShowMessageBox("Cannot insert another root element.")
           return
         else:
-          my_itemid = self.appendElement( showname, treeitemid )
-    newxml = WMXmlElement( self.copybuffer )
-    # use new uniq id
-    self.tc.SetItemPyData( my_itemid, [ self.tc.GetCount() - 1, newxml, self.uniqid ] )
-    self.uniqid += 1
-    self.createXmlTreeRecursive( self.copybuffer, my_itemid )
+          my_itemids.append( self.appendElement( names[0], itemid ) )
+          for i in range( 1, numadd ):
+            my_itemids.append( self.appendElement( names[i], my_itemids[-1] ) )
+    # convert
+    myxmls = []
+    for i in range( 0, numadd ):
+      myxmls.append( WMXmlElement( newxmls[i] ) )
+      # use new uniq id
+      self.tc.SetItemPyData( my_itemids[i], [ self.tc.GetCount() - 1, myxmls[-1], self.uniqid ] )
+      self.uniqid += 1
+      self.createXmlTreeRecursive( self.copybuffer[i], my_itemids[i] )
     self.createListCtrlFromTreeData()
-    # add to the undo queue
-    self.addActionToUndoQueue( ActionAdd( self.gatherUniqIds( my_itemid ), 0, my_itemid, newxml ) )
+    
+    if numadd == 1:
+      # add to the undo queue
+      self.addActionToUndoQueue( ActionAdd( self.gatherUniqIds( my_itemids[0] ), 0, my_itemids[0], myxmls[0] ) )
+    else:
+      uniqids = []
+      for i in range( 0, numadd ):
+        uniqids.append( self.gatherUniqIds( my_itemids[i] ) )
+      self.addActionToUndoQueue( ActionAdds( uniqids, 0, my_itemids, myxmls ) )
     self.IsSaved = False
+    # focus on newly created item
+    self.focusTreeCtrlItem( my_itemids[-1] )
 
-  def evPopupMenuDelete( self, event ):
+  def focusTreeCtrlItem( self, itemid ):
+    # TreeCtrl
+    self.tc.UnselectAll()
+    self.tc.SelectItem( itemid )
+    # ListCtrl
+    index = self.tc.GetItemPyData( itemid )[0]
+    self.deselectAllItemsListCtrl()
+    self.selectListCtrlItems( index )
+    self.lc.Focus( index )
+
+  # preprocess for deleting item
+  def preRemove( self ):
     if not self.popupIsItemAvailable( self.lc_editing_index ):
       return
     myindex = self.lc_editing_index
-    treeitemid = self.l2t_correspondence[myindex]
-    # save action
-    pos = self.calculateItemPosition( treeitemid )
-    if not self.tc.GetNextSibling( treeitemid ):
+    itemid = self.l2t_correspondence[myindex]
+    # remember item position for undoing
+    pos = self.calculateItemPosition( itemid )
+    if not self.tc.GetNextSibling( itemid ):
       pos = -1
     ## we need Element, not WMXmlElement
-    myxml, uniqids = self.createElementTreeFromTreeCtrl( treeitemid )
+    myxml, uniqids = self.createElementTreeFromTreeCtrl( itemid )
     myxml = myxml.getroot()
-    parent = self.tc.GetItemParent(treeitemid)
+    parent = self.tc.GetItemParent( itemid )
     if parent.IsOk():
       uniqids.insert( 0, self.tc.GetItemPyData(parent)[2] )
     else:
       uniqids.insert( 0, None )
-    #myxml = self.tc.GetItemPyData( treeitemid )[1]
+    return uniqids, pos, itemid, myxml
+
+  def evPopupMenuDelete( self, event ):
+    if not self.popupIsItemAvailable( self.lc_editing_index ):
+      return
+    if len( self.lc_editing_indexes ) > 1:
+      self.deleteItemMultiple()
+    else:
+      self.deleteItem()
+
+  def deleteItem( self ):
+    uniqids, pos, itemid, myxml = self.preRemove()
+    # find next item
+    nextitem = self.tc.GetNextSibling(itemid)
+    parent = self.tc.GetItemParent(itemid)
     # remove item
-    if self.deleteTreeCtrlItem( treeitemid ):
+    if self.deleteTreeCtrlItem( itemid ):
       # add to undo queue
       self.addActionToUndoQueue( ActionDel( uniqids, pos, None, myxml ) )
       # store removed data for undo
@@ -1183,17 +1255,59 @@ class WMXmlEditor( wx.App ):
       self.IsSaved = False
       # force update data
       self.createListCtrlFromTreeData()
-
-  def evPopupMenuDeleteSelected( self, event ):
-    if not self.popupIsItemAvailable( self.lc_editing_index ):
-      return
+      if nextitem.IsOk():
+        self.focusTreeCtrlItem( nextitem )
+      elif parent.IsOk():
+        self.focusTreeCtrlItem( parent )
+
+  def deleteItemMultiple( self ):
+    # remove nested indexes
+    self.removeNestedIndexes()
     # sort indexes
     self.lc_editing_indexes.sort()
     self.lc_editing_indexes.reverse()
     # use self.lc_editing_indexes to delete selected items
+    uniqidss = []
+    poss = []
+    myxmls = []
     for index in self.lc_editing_indexes:
       self.lc_editing_index = index
-      self.evPopupMenuDelete( event )
+      uniqids, pos, itemid, myxml = self.preRemove()
+      if self.deleteTreeCtrlItem( itemid ):
+        uniqidss.append( uniqids )
+        poss.append( pos )
+        myxmls.append( myxml )
+    self.addActionToUndoQueue( ActionDels( uniqidss, poss, None, myxmls ) )
+    self.IsSaved = False
+    self.createListCtrlFromTreeData()
+    # do not focus next item here
+
+  # remove nested elements from lc_editing_indexes
+  def removeNestedIndexes( self ):
+    num = len(self.lc_editing_indexes)
+    itemids = []
+    for i in range( 0, num ):
+      ind = self.lc_editing_indexes[i]
+      ind = min( ind, self.l2l_correspondence[ind] )
+      itemids.append( self.l2t_correspondence[ind] )
+      self.lc_editing_indexes[i] = ind
+
+    newone = []
+    for i in range( 0, num ):
+      if not self.isNestedItem( itemids[i] ):
+        newone.append( self.lc_editing_indexes[i] )
+
+    # replace to new data
+    self.lc_editing_indexes = list(set(newone))
+
+  def isNestedItem( self, itemid ):
+    parent = self.tc.GetItemParent( itemid )
+    while parent.IsOk():
+      ind = self.tc.GetItemPyData( parent )[0]
+      if ind in self.lc_editing_indexes:
+        return True
+      parent = self.tc.GetItemParent( parent )
+    return False
 
   def evPopupMenuInsert( self, event ):
     if self.lc_editing_index == 0:

--- a/wmxmled.xrc
+++ b/wmxmled.xrc
@@ -678,10 +678,6 @@
 			<label>Delete</label>
 			<help></help>
 		</object>
-		<object class="wxMenuItem" name="rightClickMenuDeleteSelected">
-			<label>Delete Selected</label>
-			<help></help>
-		</object>
 		<object class="separator" />
 		<object class="wxMenuItem" name="rightClickMenuInsert">
 			<label>Insert</label>