mlhim-specs-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 309
committer: Eduardo Ribeiro <xcesar@xxxxxxxxx>
branch nick: devel
timestamp: Fri 2013-02-01 17:30:12 -0200
message:
  Enabled file_new in menu.
modified:
  src/2.0/aux_gui.py
  src/2.0/cdd.py
  src/2.0/container.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/2.0/aux_gui.py'
--- src/2.0/aux_gui.py	2013-01-31 21:52:14 +0000
+++ src/2.0/aux_gui.py	2013-02-01 19:30:12 +0000
@@ -7,8 +7,6 @@
 from wx.gizmos import EditableListBox
 from wx import CheckListBox
 
-from container import container
-
 # Debug purposes !
 import gettext
 gettext.bindtextdomain('CDD','locale/en')
@@ -62,15 +60,11 @@
         root = self.AddRoot('CCD')
         metadata = self.AppendItem(root, "Metadata")
         definition = self.AppendItem(root, "definition")
-        
-        # Puts definition on the container
-        container.reset()
-        container.insert_node(1, ['definition', None, None, set()])
-        
         self.ExpandAll()
         #self.SelectItem(metadata)
         return [root, metadata, definition]
-   
+
+    # Depends on container design
     def construct_tree(self, cs):
         r, m, definition = self.setup_tree()
         

=== modified file 'src/2.0/cdd.py'
--- src/2.0/cdd.py	2013-02-01 19:08:51 +0000
+++ src/2.0/cdd.py	2013-02-01 19:30:12 +0000
@@ -40,7 +40,8 @@
 import config
 ConfigDialog = config.ConfigDialog
 
-from container import container
+import container
+container = container.Container()
 
 UnderConstruction = cdd_gui.UnderConstruction
 
@@ -50,6 +51,7 @@
         self.init_things()
 
     def init_things(self):
+
         self.tree = self.tree_ctrl_ccd
         # Setup the tree
         self.root, self.metadata_item, self.definition_item = self.tree_ctrl_ccd.setup_tree()
@@ -58,9 +60,19 @@
         self.setup_config()
         self.setup_metadata()
         self.button_ok.Hide()
+
+        # Setup the tree
+        self.setup_tree()
+    
+    def setup_tree(self):
+        self.root, self.metadata_item, self.definition_item = self.tree_ctrl_ccd.setup_tree()
         
+        # Puts definition on the container
+        container.reset()
+        container.insert_node(1, ['definition', None, None, set()])
+
         self.tree_ctrl_ccd.SelectItem(self.metadata_item)
-
+    
     def get_definition_child(self):
         child, cookie = self.tree.GetFirstChild(self.definition_item)
         txt = self.tree.GetItemText(child)
@@ -284,14 +296,15 @@
         pass
 
     def file_new(self, event):  # wxGlade: MainFrame.<event_handler>
-        not_implemented_diag(self)
-
+        self.setup_tree()
+        self.metadata.read_config()
+        
     def file_open(self, event):  # wxGlade: MainFrame.<event_handler>
         wildcard = \
             "Pickle files (*.pickle)|*.pickle|" \
             "All files (*.*)|*.*"
 
-        path = self.config_dialog.config.get('DEFAULT', 'workspace')
+        path = self.config_dialog.workspace
         
         filename = open_file_diag(self, path, wildcard=wildcard)
         if not filename: return
@@ -304,7 +317,7 @@
         self.tree_ctrl_ccd.SelectItem(self.metadata_item)
         
     def file_save(self, event, ask=False):  # wxGlade: MainFrame.<event_handler>
-        path = self.config_dialog.config.get('DEFAULT', 'workspace')
+        path = self.config_dialog.workspace
         try:
             self.first_save
             if ask or not self.pickle_name:

=== modified file 'src/2.0/container.py'
--- src/2.0/container.py	2013-01-31 19:11:59 +0000
+++ src/2.0/container.py	2013-02-01 19:30:12 +0000
@@ -52,7 +52,7 @@
         pickle.dump(self.structure, fd)
 
     @classmethod
-    def load_structure(self, fd):
+    def load_structure(cls, fd):
         return pickle.load(fd)
     
     def set_metadata(self, md):
@@ -60,5 +60,3 @@
         
     def get_metadata(self):
         return self.structure.get('metadata')
-    
-container = Container()