← Back to team overview

mlhim-specs-dev team mailing list archive

[Branch ~cdd-dev/cdd/trunk] Rev 162: Starting work on Tools in CDD.

 

------------------------------------------------------------
revno: 162
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: cdd
timestamp: Mon 2012-07-09 00:25:28 -0300
message:
  Starting work on Tools in CDD.
modified:
  src/cdd.py
  src/tools.py
  src/tree.py


--
lp:cdd
https://code.launchpad.net/~cdd-dev/cdd/trunk

Your team MLHIM Specifications Developers is subscribed to branch lp:cdd.
To unsubscribe from this branch go to https://code.launchpad.net/~cdd-dev/cdd/trunk/+edit-subscription
=== modified file 'src/cdd.py'
--- src/cdd.py	2012-07-09 01:13:23 +0000
+++ src/cdd.py	2012-07-09 03:25:28 +0000
@@ -303,7 +303,7 @@
         splitter.SetMinimumPaneSize(100)
         # Create tree
         global tree
-        g.tree = tree = XML_Tree(splitter, -1)
+        g.tree = tree = CCD_Tree(splitter, -1)
 
         # Init pull-down menu data
         global pullDownMenu

=== modified file 'src/tools.py'
--- src/tools.py	2012-07-09 01:13:23 +0000
+++ src/tools.py	2012-07-09 03:25:28 +0000
@@ -35,7 +35,7 @@
         else:
             wx.Panel.__init__(self, parent, -1, style=wx.WANTS_CHARS)
 
-        self.SetBackgroundColour((225,229,11))
+        self.SetBackgroundColour((255,255,255))
 
         # Create sizer for groups
         self.sizer = wx.BoxSizer(wx.VERTICAL)
@@ -46,57 +46,79 @@
         # Current state (what to enable/disable)
         self.state = None
         groups = [
-            ["Windows",
-             (ID_NEW.FRAME, images.getToolFrameBitmap()),
-             (ID_NEW.DIALOG, images.getToolDialogBitmap()),
-             (ID_NEW.PANEL, images.getToolPanelBitmap())],
-            ["Menus",
-             (ID_NEW.TOOL_BAR, images.getToolToolBarBitmap()),
-             (ID_NEW.MENU_BAR, images.getToolMenuBarBitmap()),
-             (ID_NEW.MENU, images.getToolMenuBitmap()),
-             (ID_NEW.TOOL, images.getToolToolBitmap()),
-             (ID_NEW.MENU_ITEM, images.getToolMenuItemBitmap()),
-             (ID_NEW.SEPARATOR, images.getToolSeparatorBitmap())],
-            ["Sizers",
-             (ID_NEW.BOX_SIZER, images.getToolBoxSizerBitmap()),
-             (ID_NEW.STATIC_BOX_SIZER, images.getToolStaticBoxSizerBitmap()),
-             (ID_NEW.GRID_SIZER, images.getToolGridSizerBitmap()),
-             (ID_NEW.FLEX_GRID_SIZER, images.getToolFlexGridSizerBitmap()),
-             (ID_NEW.GRID_BAG_SIZER, images.getToolGridBagSizerBitmap()),
-             (ID_NEW.SPACER, images.getToolSpacerBitmap())],
-            ["Controls",
-             (ID_NEW.STATIC_TEXT, images.getToolStaticTextBitmap()),
-             (ID_NEW.STATIC_BITMAP, images.getToolStaticBitmapBitmap()),
-             (ID_NEW.STATIC_LINE, images.getToolStaticLineBitmap()),
-
-             (ID_NEW.BUTTON, images.getToolButtonBitmap()),
-             (ID_NEW.BITMAP_BUTTON, images.getToolBitmapButtonBitmap()),
-             (ID_NEW.STATIC_BOX, images.getToolStaticBoxBitmap()),
-
-             (ID_NEW.TEXT_CTRL, images.getToolTextCtrlBitmap()),
-             (ID_NEW.COMBO_BOX, images.getToolComboBoxBitmap()),
-             (ID_NEW.CHOICE, images.getToolChoiceBitmap()),
-
-             (ID_NEW.RADIO_BUTTON, images.getToolRadioButtonBitmap()),
-             (ID_NEW.CHECK_BOX, images.getToolCheckBoxBitmap()),
-             (ID_NEW.RADIO_BOX, images.getToolRadioBoxBitmap()),
-
-             (ID_NEW.SPIN_CTRL, images.getToolSpinCtrlBitmap()),
-             (ID_NEW.SPIN_BUTTON, images.getToolSpinButtonBitmap()),
-             (ID_NEW.SCROLL_BAR, images.getToolScrollBarBitmap()),
-
-             (ID_NEW.SLIDER, images.getToolSliderBitmap()),
-             (ID_NEW.GAUGE, images.getToolGaugeBitmap()),
-             (ID_NEW.TREE_CTRL, images.getToolTreeCtrlBitmap()),
-
-             (ID_NEW.LIST_BOX, images.getToolListBoxBitmap()),
-             (ID_NEW.CHECK_LIST, images.getToolCheckListBitmap()),
-             (ID_NEW.LIST_CTRL, images.getToolListCtrlBitmap()),
-
-             (ID_NEW.NOTEBOOK, images.getToolNotebookBitmap()),
-             (ID_NEW.SPLITTER_WINDOW, images.getToolSplitterWindowBitmap()),
-
-             (ID_NEW.UNKNOWN, images.getToolUnknownBitmap())]
+            ["Metadata",(ID_NEW.PANEL, images.getToolPanelBitmap())],
+            ["Entries",
+            (ID_NEW.PANEL, images.getToolPanelBitmap()),
+            (ID_NEW.PANEL, images.getToolPanelBitmap()),
+            (ID_NEW.PANEL, images.getToolPanelBitmap())],
+            ["Structures",
+            (ID_NEW.PANEL, images.getToolPanelBitmap()),
+            (ID_NEW.PANEL, images.getToolPanelBitmap()),
+            (ID_NEW.PANEL, images.getToolPanelBitmap())],
+            ["Datatypes",
+            (ID_NEW.CHOICE, images.getToolChoiceBitmap()),
+            (ID_NEW.CHOICE, images.getToolChoiceBitmap()),
+            (ID_NEW.CHOICE, images.getToolChoiceBitmap()),
+            (ID_NEW.CHOICE, images.getToolChoiceBitmap()),
+            (ID_NEW.CHOICE, images.getToolChoiceBitmap()),
+            (ID_NEW.CHOICE, images.getToolChoiceBitmap()),
+            (ID_NEW.CHOICE, images.getToolChoiceBitmap()),
+            (ID_NEW.CHOICE, images.getToolChoiceBitmap()),
+            (ID_NEW.CHOICE, images.getToolChoiceBitmap()),
+            (ID_NEW.CHOICE, images.getToolChoiceBitmap())],
+
+
+##            ["Windows",
+##             (ID_NEW.FRAME, images.getToolFrameBitmap()),
+##             (ID_NEW.DIALOG, images.getToolDialogBitmap()),
+##             (ID_NEW.PANEL, images.getToolPanelBitmap())],
+##            ["Menus",
+##             (ID_NEW.TOOL_BAR, images.getToolToolBarBitmap()),
+##             (ID_NEW.MENU_BAR, images.getToolMenuBarBitmap()),
+##             (ID_NEW.MENU, images.getToolMenuBitmap()),
+##             (ID_NEW.TOOL, images.getToolToolBitmap()),
+##             (ID_NEW.MENU_ITEM, images.getToolMenuItemBitmap()),
+##             (ID_NEW.SEPARATOR, images.getToolSeparatorBitmap())],
+##            ["Sizers",
+##             (ID_NEW.BOX_SIZER, images.getToolBoxSizerBitmap()),
+##             (ID_NEW.STATIC_BOX_SIZER, images.getToolStaticBoxSizerBitmap()),
+##             (ID_NEW.GRID_SIZER, images.getToolGridSizerBitmap()),
+##             (ID_NEW.FLEX_GRID_SIZER, images.getToolFlexGridSizerBitmap()),
+##             (ID_NEW.GRID_BAG_SIZER, images.getToolGridBagSizerBitmap()),
+##             (ID_NEW.SPACER, images.getToolSpacerBitmap())],
+##            ["Controls",
+##             (ID_NEW.STATIC_TEXT, images.getToolStaticTextBitmap()),
+##             (ID_NEW.STATIC_BITMAP, images.getToolStaticBitmapBitmap()),
+##             (ID_NEW.STATIC_LINE, images.getToolStaticLineBitmap()),
+##
+##             (ID_NEW.BUTTON, images.getToolButtonBitmap()),
+##             (ID_NEW.BITMAP_BUTTON, images.getToolBitmapButtonBitmap()),
+##             (ID_NEW.STATIC_BOX, images.getToolStaticBoxBitmap()),
+##
+##             (ID_NEW.TEXT_CTRL, images.getToolTextCtrlBitmap()),
+##             (ID_NEW.COMBO_BOX, images.getToolComboBoxBitmap()),
+##             (ID_NEW.CHOICE, images.getToolChoiceBitmap()),
+##
+##             (ID_NEW.RADIO_BUTTON, images.getToolRadioButtonBitmap()),
+##             (ID_NEW.CHECK_BOX, images.getToolCheckBoxBitmap()),
+##             (ID_NEW.RADIO_BOX, images.getToolRadioBoxBitmap()),
+##
+##             (ID_NEW.SPIN_CTRL, images.getToolSpinCtrlBitmap()),
+##             (ID_NEW.SPIN_BUTTON, images.getToolSpinButtonBitmap()),
+##             (ID_NEW.SCROLL_BAR, images.getToolScrollBarBitmap()),
+##
+##             (ID_NEW.SLIDER, images.getToolSliderBitmap()),
+##             (ID_NEW.GAUGE, images.getToolGaugeBitmap()),
+##             (ID_NEW.TREE_CTRL, images.getToolTreeCtrlBitmap()),
+##
+##             (ID_NEW.LIST_BOX, images.getToolListBoxBitmap()),
+##             (ID_NEW.CHECK_LIST, images.getToolCheckListBitmap()),
+##             (ID_NEW.LIST_CTRL, images.getToolListCtrlBitmap()),
+##
+##             (ID_NEW.NOTEBOOK, images.getToolNotebookBitmap()),
+##             (ID_NEW.SPLITTER_WINDOW, images.getToolSplitterWindowBitmap()),
+##
+##             (ID_NEW.UNKNOWN, images.getToolUnknownBitmap())]
             ]
         for grp in groups:
             self.AddGroup(grp[0])

=== modified file 'src/tree.py'
--- src/tree.py	2012-07-09 01:13:23 +0000
+++ src/tree.py	2012-07-09 03:25:28 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Name:         tree.py
-# Purpose:      CDD editor, XML_tree class
+# Purpose:      CDD editor, CCD_Tree class
 # (c) 2012 - Timothy w.Cook & Contributors. (see: credits)
 
 # Adapted from the XRC editor by Roman Rolinsky <rolinsky@xxxxxxxxxxxxxx>
@@ -433,7 +433,7 @@
 
 ################################################################################
 
-class XML_Tree(wx.TreeCtrl):
+class CCD_Tree(wx.TreeCtrl):
     def __init__(self, parent, id):
         wx.TreeCtrl.__init__(self, parent, id, style = wx.TR_HAS_BUTTONS | wx.TR_MULTIPLE)
         self.SetBackgroundColour(wx.Colour(206, 207, 243))