[Pythoncard-cvs] PythonCard/tools/resourceEditor/modules menuDialog.py,1.14,1.15

[Alex T. <ale...@us...>]

Update of /cvsroot/pythoncard/PythonCard/tools/resourceEditor/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28081/tools/resourceEditor/modules

Modified Files:
	menuDialog.py 
Log Message:
NewMenu and NewMenuItem now add "in place" - i.e. below currently selected line.
If the name of a new item is left unchanged, then it will be derived from
  the label value.


Index: menuDialog.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/tools/resourceEditor/modules/menuDialog.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** menuDialog.py	10 May 2004 05:02:50 -0000	1.14
--- menuDialog.py	10 Aug 2004 23:41:00 -0000	1.15
***************
*** 193,199 ****
--- 193,220 ----
  
      def on_fldLabel_loseFocus(self, event):
+         def normalize(label):
+             name = label.replace("&", "").replace(".", "").replace(" ", "")
+             return name
+ 
          sel = self.components.listMenus.selection
          try:
              label = event.target.text
+             if self.menuList[sel]['type'] == 'Menu' and self.menuList[sel]['label'] == 'New Menu':
+                 oldname = self.menuList[sel]['name']
+                 if oldname == 'menuNewMenu':
+                     name = 'menu'+normalize(label)
+                     self.menuList[sel]['name'] = name
+                     self.components.fldName.text = name
+             elif self.menuList[sel]['type'] == 'MenuItem' and self.menuList[sel]['label'] == 'New Item':
+                 oldname = self.menuList[sel]['name']
+                 menuname = 'menuMenu'
+                 for i in range(sel+1):
+                     if self.menuList[sel-i]['type'] == 'Menu':
+                         menuname = self.menuList[sel-i]['name'] 
+                         break
+                 if oldname == menuname+'NewItem':
+                     name = menuname+normalize(label)
+                     self.menuList[sel]['name'] = name
+                     self.components.fldName.text = name
              self.menuList[sel]['label'] = label
              if self.menuList[sel]['type'] == 'MenuItem':
***************
*** 326,338 ****
  
      def on_btnNewMenu_mouseClick(self, event):
!         self.menuList.append(self.buildMenu('menuNewMenu', 'New Menu'))
!         sel = len(self.menuList) - 1
          self.rebuildListMenus(sel)
          self.displayItemAttributes(sel)
  
      def on_btnNewMenuItem_mouseClick(self, event):
!         self.menuList.append(self.buildMenuItem('menuNewMenuItem', 'New MenuItem', '', None, 1, 0, 0))
!         sel = len(self.menuList) - 1
          self.rebuildListMenus(sel)
          self.displayItemAttributes(sel)
- 
--- 347,375 ----
  
      def on_btnNewMenu_mouseClick(self, event):
!         sel = self.components.listMenus.selection
!         self.menuList.append(" ") # extend list
!         if sel == -1:
!             sel = len(self.menuList) - 1
!         else:
!             self.menuList[sel+1:] = self.menuList[sel:-1]
!             sel = sel+1
!         self.menuList[sel] = self.buildMenu('menuNewMenu', 'New Menu')
          self.rebuildListMenus(sel)
          self.displayItemAttributes(sel)
  
      def on_btnNewMenuItem_mouseClick(self, event):
!         sel = self.components.listMenus.selection
!         self.menuList.append(" ") # extend list
!         if sel == -1:
!             sel = len(self.menuList) - 1
!         else:
!             self.menuList[sel+1:] = self.menuList[sel:-1]
!             sel = sel+1
!         name = 'menuMenu'
!         for i in range(1, sel+1):
!             if self.menuList[sel-i]['type'] == 'Menu':
!                 name = self.menuList[sel-i]['name'] 
!                 break
!         self.menuList[sel] = self.buildMenuItem(name+'NewItem', 'New Item', '', None, 1, 0, 0)
          self.rebuildListMenus(sel)
          self.displayItemAttributes(sel)