Index: qPloneCaptchaField/trunk/README.txt
===================================================================
--- qPloneCaptchaField/trunk/README.txt	(revision 3713)
+++ 	(revision )
@@ -1,38 +1,0 @@
-Plone Capcha Field
-==================
-
-qPloneCaptchaField is a Plone product that allows to add captcha field to the form, created with PloneFormGen product.
-
-Supported Plone versions
-------------------------
-
-* 3.x
-
-Dependencies
-------------
-
-* PloneFormGen
-* qPloneCaptchas
-
-Installation
-------------
-
-Please make sure that the following products are intalled in the following order:
-
-* PloneFormGen
-* qPloneCaptchas
-* qPloneCaptchaField
-
-Links
------
-    
-* Documentation - http://projects.quintagroup.com/products/wiki/qPloneCaptchaField
-* Screencast - http://quintagroup.com/cms/screencasts/qplonecaptchafield
-
-Authors
--------
-
-The product is developed by Quintagroup.com team:
-
-* Volodymyr Cherepanyak
-* Taras Melnychuk
Index: qPloneCaptchaField/trunk/content/CaptchaField.py
===================================================================
--- qPloneCaptchaField/trunk/content/CaptchaField.py	(revision 3713)
+++ qPloneCaptchaField/trunk/content/CaptchaField.py	(revision 1)
@@ -1,4 +1,2 @@
-from zope.event import notify
-from zope.lifecycleevent import ObjectCreatedEvent, ObjectModifiedEvent
 from Products.CMFCore.permissions import View
 
@@ -6,5 +4,5 @@
 from Products.ATContentTypes.content.base import registerATCT
 
-from Products.PloneFormGen.content.fieldsBase import BareFieldSchema, BaseFormField, BaseFieldSchemaStringDefault
+from Products.PloneFormGen.content.fieldsBase import BaseFormField, BaseFieldSchemaStringDefault
 from Products.PloneFormGen.content.fields import FGStringField
 
@@ -12,38 +10,11 @@
 from Products.qPloneCaptchaField.widgets.CaptchaWidget import CaptchaWidget
 
-CAPTCHA_ID = 'key'
-
-def finalizeCaptchaFieldSchema( schema ):
-    schema['title'].default= 'key'
-    for field in ('title', 
-                  'description',
-                  'required', 
-                  'hidden', 
-                  'fgTDefault', 
-                  'fgTEnabled', 
-                  'fgDefault',
-                  'fgTValidator'):
-        schema[field].widget.visible = {'view':'invisible','edit':'invisible'}
-
-CaptchaFieldSchema = BaseFieldSchemaStringDefault.copy()
-finalizeCaptchaFieldSchema( CaptchaFieldSchema )
-
-def addCaptchaField(self, id, **kwargs):
-    id = CAPTCHA_ID 
-    obj = CaptchaField(id)
-    notify(ObjectCreatedEvent(obj))
-    self._setObject(id, obj)
-    obj = self._getOb(id)
-    obj.initializeArchetype(**kwargs)
-    notify(ObjectModifiedEvent(obj))
-    return obj.getId()
-
 class CaptchaField(FGStringField):
 
-    _at_rename_after_creation = False
-    schema = CaptchaFieldSchema
+    schema = BaseFieldSchemaStringDefault
 
     def __init__(self, oid, **kwargs):
         """ initialize class """
+
         BaseFormField.__init__(self, oid, **kwargs)
 
Index: qPloneCaptchaField/trunk/profiles/default/factorytool.xml
===================================================================
--- qPloneCaptchaField/trunk/profiles/default/factorytool.xml	(revision 3713)
+++ 	(revision )
@@ -1,6 +1,0 @@
-<?xml version="1.0"?>
-<object name="portal_factory" meta_type="Plone Factory Tool">
- <factorytypes>
-  <type portal_type="CaptchaField"/>
- </factorytypes>
-</object>
Index: qPloneCaptchaField/trunk/profiles/default/propertiestool.xml
===================================================================
--- qPloneCaptchaField/trunk/profiles/default/propertiestool.xml	(revision 3713)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?xml version="1.0"?>
-<object name="portal_properties" meta_type="Plone Properties Tool">
- <object name="navtree_properties" meta_type="Plone Property Sheet">
-  <property name="metaTypesNotToList" type="lines" purge="False">
-   <element value="CaptchaField"/>
-  </property>
- </object>
-</object>
Index: qPloneCaptchaField/trunk/profiles/default/types/CaptchaField.xml
===================================================================
--- qPloneCaptchaField/trunk/profiles/default/types/CaptchaField.xml	(revision 3713)
+++ qPloneCaptchaField/trunk/profiles/default/types/CaptchaField.xml	(revision 1)
@@ -5,5 +5,5 @@
     <property name="title">Captcha Field</property>
     <property
-             name="description">Extension for PloneFormGen. Field that prevents automatic page submit.</property>
+             name="description">Extension for PloneFormGen. Field that helps from automatic page submit.</property>
     <property name="content_icon">captcha_field.gif</property>
     <property name="content_meta_type">CaptchaField</property>
@@ -34,3 +34,34 @@
         <permission value="Modify portal content"/>
     </action>
+    <action title="Properties" action_id="metadata" category="object"
+            condition_expr="" url_expr="string:${object_url}/properties"
+            visible="True">
+        <permission value="Modify portal content"/>
+    </action>
+    <action title="References" action_id="references" category="object"
+            condition_expr="object/archetype_tool/has_graphviz"
+            url_expr="string:${object_url}/reference_graph" visible="True">
+        <permission value="Modify portal content"/>
+        <permission value="Review portal content"/>
+    </action>
+    <action title="History" action_id="history" category="object"
+            condition_expr="" url_expr="string:${object_url}/atct_history"
+            visible="False">
+        <permission value="ATContentTypes: View history"/>
+    </action>
+    <action title="External Edit" action_id="external_edit" category="object"
+            condition_expr="object/externalEditorEnabled"
+            url_expr="string:${object_url}/external_edit" visible="False">
+        <permission value="Modify portal content"/>
+    </action>
+    <action title="Sharing" action_id="local_roles" category="object"
+            condition_expr="" url_expr="string:${object_url}/sharing" visible="True">
+        <permission value="Manage properties"/>
+    </action>
+    <action title="State" action_id="content_status_history"
+            category="object_tabs"
+            condition_expr="python:object and portal.portal_workflow.getTransitionsFor(object, object.getParentNode())"
+            url_expr="string:$object_url/content_status_history" visible="False">
+        <permission value="View"/>
+    </action>
 </object>
Index: qPloneCaptchaField/trunk/profiles/default/workflows.xml
===================================================================
--- qPloneCaptchaField/trunk/profiles/default/workflows.xml	(revision 3713)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?xml version="1.0"?>
-<object name="portal_workflow" meta_type="Plone Workflow Tool">
- <bindings>
-  <type type_id="CaptchaField">
-    <bound-workflow workflow_id=""/>
-  </type>
- </bindings>
-</object>
Index: qPloneCaptchaField/trunk/skins/qplonecaptchafield/createObject.cpy
===================================================================
--- qPloneCaptchaField/trunk/skins/qplonecaptchafield/createObject.cpy	(revision 3713)
+++ 	(revision )
@@ -1,59 +1,0 @@
-## Controller Python Script "createObject"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind state=state
-##bind subpath=traverse_subpath
-##parameters=id=None,type_name=None,script_id=None
-##title=
-##
-
-from DateTime import DateTime
-from Products.CMFPlone.utils import transaction_note
-from Products.CMFPlone import PloneMessageFactory as _
-from Products.CMFCore.utils import getToolByName
-REQUEST=context.REQUEST
-
-if type_name == 'CaptchaField':
-    id = 'key'
-
-if id is None:
-    id=context.generateUniqueId(type_name)
-
-if type_name is None:
-    raise Exception, 'Type name not specified'
-
-types_tool = getToolByName(context, 'portal_types')
-
-fti = types_tool.getTypeInfo(type_name)
-
-if not fti.queryMethodID('edit') and \
-   not fti.getActionObject('object/edit'):
-    state.setStatus('success_no_edit')
-
-if context.portal_factory.getFactoryTypes().has_key(type_name):
-    new_url = 'portal_factory/' + type_name + '/' + id
-    if state.getStatus() != 'success_no_edit':
-        new_url = new_url + '/edit'
-    state.set(status='factory', next_action='redirect_to:string:%s'%new_url)
-    # If there's an issue with object creation, let the factory handle it
-    return state
-else:
-    new_id = context.invokeFactory(id=id, type_name=type_name)
-    if new_id is None or new_id == '':
-       new_id = id
-    o=getattr(context, new_id, None)
-    tname = o.getTypeInfo().Title()
-    message = _(u'${tname} has been created.', mapping={u'tname' : tname})
-    transaction_note('Created %s with id %s in %s' % (o.getTypeInfo().getId(), new_id, context.absolute_url()))
-
-if o is None:
-    raise Exception
-
-if script_id:
-    state.setId(script_id)
-
-if message:
-    context.plone_utils.addPortalMessage(message)
-return state.set(context=o)
Index: qPloneCaptchaField/trunk/version.txt
===================================================================
--- qPloneCaptchaField/trunk/version.txt	(revision 3713)
+++ qPloneCaptchaField/trunk/version.txt	(revision 1)
@@ -1,1 +1,1 @@
-0.2.2
+0.1.0
