mlhim-specs-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 165
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: cdd
timestamp: Wed 2012-07-11 12:17:05 -0300
message:
  Working on Metadata page.
modified:
  src/params.py
  src/tree.py
  src/xxx.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/params.py'
--- src/params.py	2012-07-09 01:13:23 +0000
+++ src/params.py	2012-07-11 15:17:05 +0000
@@ -156,7 +156,7 @@
                 else:
                     value2.append(i)
         ignored = []
-        # Set generic styles, collect non-standart values
+        # Set generic styles, collect non-standard values
         for i in value2:
             try:
                 listBoxGeneric.Check(self.valuesGeneric.index(i))
@@ -925,6 +925,7 @@
             self.textModified = False
         dlg.Destroy()
 
+# Parameters dictionary
 paramDict = {
     'flag': ParamFlag,
     'style': ParamStyle, 'exstyle': ParamExStyle,

=== modified file 'src/tree.py'
--- src/tree.py	2012-07-10 19:39:08 +0000
+++ src/tree.py	2012-07-11 15:17:05 +0000
@@ -306,20 +306,23 @@
 
 
         self.topLevel = [
-            (ID_NEW.PANEL, 'Panel', 'Create panel'),
-            (ID_NEW.DIALOG, 'Dialog', 'Create dialog'),
-            (ID_NEW.FRAME, 'Frame', 'Create frame'),
-            (ID_NEW.WIZARD, 'Wizard', 'Create wizard'),
-            None,
-            (ID_NEW.TOOL_BAR, 'ToolBar', 'Create toolbar'),
-            (ID_NEW.MENU_BAR, 'MenuBar', 'Create menubar'),
-            (ID_NEW.MENU, 'Menu', 'Create menu'),
-            None,
-            (ID_NEW.BITMAP, 'Bitmap', 'Create bitmap'),
-            (ID_NEW.ICON, 'Icon', 'Create icon'),
-#TODO: Add all MLHIM classes that can be toplevel
+            #(ID_NEW.PANEL, 'Panel', 'Create panel'),
+            #(ID_NEW.DIALOG, 'Dialog', 'Create dialog'),
+            #(ID_NEW.FRAME, 'Frame', 'Create frame'),
+            #(ID_NEW.WIZARD, 'Wizard', 'Create wizard'),
+            #None,
+            #(ID_NEW.TOOL_BAR, 'ToolBar', 'Create toolbar'),
+            #(ID_NEW.MENU_BAR, 'MenuBar', 'Create menubar'),
+            #(ID_NEW.MENU, 'Menu', 'Create menu'),
+            #None,
+            #(ID_NEW.BITMAP, 'Bitmap', 'Create bitmap'),
+            #(ID_NEW.ICON, 'Icon', 'Create icon'),
+            (ID_NEW.CCD, 'CCD', 'Create the CCD'),
+            ]
+
+#TODO: Determine how to set up all MLHIM classes in these grouping lists.
+        self.ccdTop = [
             (ID_NEW.METADATA, 'Metatdata', 'Create the Metadata'),
-            (ID_NEW.CCD, 'CCD', 'Create the CCD'),
             (ID_NEW.CARE, 'CareEntry', 'Create the CareEntry CCD'),
             (ID_NEW.ADMIN, 'AdminEntry', 'Create the AdminEntry CCD'),
             (ID_NEW.DEMOG, 'DemogEntry', 'Create the DemogEntry CCD'),
@@ -328,8 +331,6 @@
             (ID_NEW.SLOT, 'Slot', 'Create the Slot CCD'),
             ]
 
-#TODO: Determine how to set up all MLHIM classes in these grouping lists.
-
         self.containers = [
              (ID_NEW.PANEL, 'Panel', 'Create panel'),
              (ID_NEW.NOTEBOOK, 'Notebook', 'Create notebook control'),

=== modified file 'src/xxx.py'
--- src/xxx.py	2012-07-10 19:39:08 +0000
+++ src/xxx.py	2012-07-11 15:17:05 +0000
@@ -918,21 +918,24 @@
 #TODO: Add all MLHIM classes
 
 class Metadata(xxxObject):
-    allParams = ['title', 'centered', 'pos', 'size', 'style']
-    paramDict = {'centered': ParamBool}
-    required = ['title']
-    default = {'title': ''}
-    winStyles = ['wxDEFAULT_FRAME_STYLE', 'wxDEFAULT_DIALOG_STYLE', 'wxCAPTION',
-                 'wxSTAY_ON_TOP', 'wxSYSTEM_MENU', 'wxTHICK_FRAME',
-                 'wxRESIZE_BORDER', 'wxRESIZE_BOX', 'wxCLOSE_BOX',
-                 'wxMAXIMIZE_BOX', 'wxMINIMIZE_BOX',
-                 'wxFRAME_NO_TASKBAR', 'wxFRAME_SHAPED', 'wxFRAME_TOOL_WINDOW',
-                 'wxFRAME_FLOAT_ON_PARENT',
-                 'wxNO_3D', 'wxTAB_TRAVERSAL']
-    exStyles = ['wxWS_EX_VALIDATE_RECURSIVELY', 'wxFRAME_EX_METAL']
-    styles = ['fg', 'bg', 'font', 'enabled', 'focused', 'hidden', 'exstyle',
-              'tooltip']
-
+    """
+    Dublin Core metadata definitions to be stored as xml/rdf in the CCD.
+    """
+    allParams = ['Date', 'Subject', 'AuthorName', 'AuthorEmail', 'ContributorName', 'ContributorEmail', 'Publisher', 'Source', 'Rights', 'Relations', 'Coverage', 'Description']
+    paramDict = {'Date':ParamText, 'Subject':ParamMultilineText, 'AuthorName':ParamText, 'AuthorEmail':ParamText, 'ContributorName':ParamMultilineText, 'ContributorEmail':ParamMultilineText, 'Publisher':ParamText, 'Source':ParamText, 'Rights':ParamText, 'Relations':ParamText, 'Coverage':ParamText, 'Description':ParamMultilineText}
+    required = ['Date', 'Rights', 'Relations', 'Coverage']
+    default = {'Date':'YYYY-MM-DD', 'Rights':'CC-BY', 'Relations':'None', 'Coverage':'Universal'}
+    #winStyles = ['wxDEFAULT_FRAME_STYLE', 'wxDEFAULT_DIALOG_STYLE', 'wxCAPTION',
+                 #'wxSTAY_ON_TOP', 'wxSYSTEM_MENU', 'wxTHICK_FRAME',
+                 #'wxRESIZE_BORDER', 'wxRESIZE_BOX', 'wxCLOSE_BOX',
+                 #'wxMAXIMIZE_BOX', 'wxMINIMIZE_BOX',
+                 #'wxFRAME_NO_TASKBAR', 'wxFRAME_SHAPED', 'wxFRAME_TOOL_WINDOW',
+                 #'wxFRAME_FLOAT_ON_PARENT',
+                 #'wxNO_3D', 'wxTAB_TRAVERSAL']
+    #exStyles = ['wxWS_EX_VALIDATE_RECURSIVELY', 'wxFRAME_EX_METAL']
+    #styles = ['fg', 'bg', 'font', 'enabled', 'focused', 'hidden', 'exstyle',
+              #'tooltip']
+    styles = []
 
 class CCD(xxxObject):
     allParams = ['title', 'centered', 'pos', 'size', 'style']