move imaging control panel to cmfplone

Products/CMFPlone/controlpanel/browser/configure.zcml

@@ -3,6 +3,9 @@
     xmlns:five="http://namespaces.zope.org/five"
     xmlns:browser="http://namespaces.zope.org/browser">
 
+  <!-- needed for control panel permission -->
+  <include package="plone.app.imaging" />
+
   <permission id="plone.app.controlpanel.TinyMCE"
               title="Plone Site Setup: TinyMCE">
     <role name="Manager"/>
@@ -232,4 +235,11 @@
     permission="cmf.ManagePortal"
     />
 
+ <browser:page
+    for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+    name="imaging-controlpanel"
+    class=".imaging.ImagingControlPanel"
+    permission="plone.app.controlpanel.Imaging"
+    />
+
 </configure>

Products/CMFPlone/controlpanel/browser/imaging.py

@@ -0,0 +1,18 @@
+from Products.CMFPlone import PloneMessageFactory as _
+from Products.CMFPlone.interfaces.controlpanel import IImagingSchema
+from logging import getLogger
+from plone.app.registry.browser import controlpanel
+
+log = getLogger('Plone')
+
+
+class ImagingControlPanelForm(controlpanel.RegistryEditForm):
+
+    id = "ImagingSettings"
+    label = _(u"Image Handling")
+    schema = IImagingSchema
+    schema_prefix = "plone"
+
+
+class ImagingControlPanel(controlpanel.ControlPanelFormWrapper):
+    form = ImagingControlPanelForm

Products/CMFPlone/interfaces/__init__.py

@@ -25,6 +25,7 @@
 from controlpanel import ITinyMCEToolbarSchema
 from controlpanel import ITypesSchema
 from controlpanel import IUserGroupsSettingsSchema
+from controlpanel import IImagingSchema
 from events import IConfigurationChangedEvent
 from events import IReorderedEvent
 from events import ISiteManagerCreatedEvent

Products/CMFPlone/interfaces/controlpanel.py

@@ -1386,3 +1386,33 @@ class IUserGroupsSettingsSchema(Interface):
             u"listing all of them."),
         default=False
     )
+
+
+class IImagingSchema(Interface):
+    allowed_sizes = schema.List(
+        title=_(u'Allowed image sizes'),
+        description=_(u'Specify all allowed maximum image dimensions, '
+                      'one per line. '
+                      'The required format is <name> <width>:<height>.'),
+        value_type=schema.TextLine(),
+        default=[
+            "large 768:768",
+            "preview 400:400",
+            "mini 200:200",
+            "thumb 128:128",
+            "tile 64:64",
+            "icon 32:32",
+            "listing 16:16"],
+        required=False,
+    )
+
+    quality = schema.Int(
+        title=_(u'Scaled image quality'),
+        description=_(u'A value for the quality of scaled images, from 1 '
+                      '(lowest) to 95 (highest). A value of 0 will mean '
+                      'plone.scaling\'s default will be used, which is '
+                      'currently 88.'),
+        min=0,
+        max=95,
+        default=88
+    )

Products/CMFPlone/profiles/default/controlpanel.xml

@@ -168,4 +168,11 @@
     i18n:attributes="title">
   <permission>Plone Site Setup: TinyMCE</permission>
  </configlet>
+  <configlet title="Image Handling" action_id="ImagingSettings" appId="ImagingSettings"
+    category="Products" condition_expr=""
+    icon_expr="string:$portal_url/image_icon.png"
+    url_expr="string:${portal_url}/@@imaging-controlpanel" visible="True"
+    i18n:attributes="title">
+  <permission>Plone Site Setup: Imaging</permission>
+ </configlet>
 </object>

Products/CMFPlone/profiles/default/metadata.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>5004</version>
+  <version>5005</version>
 </metadata>

Products/CMFPlone/profiles/default/propertiestool.xml

@@ -155,17 +155,4 @@
   <property name="external_logout_url" type="string"/>
   <property name="external_login_iframe" type="boolean"/>
  </object>
- <object name="imaging_properties" meta_type="Plone Property Sheet">
-  <property name="title">Image handling properties</property>
-  <property name="allowed_sizes" type="lines">
-   <element value="large 768:768"/>
-   <element value="preview 400:400"/>
-   <element value="mini 200:200"/>
-   <element value="thumb 128:128"/>
-   <element value="tile 64:64"/>
-   <element value="icon 32:32"/>
-   <element value="listing 16:16"/>
-  </property>
-  <property name="quality" type="int">88</property>
- </object>
 </object>

Products/CMFPlone/profiles/dependencies/registry.xml

@@ -24,6 +24,8 @@
            prefix="plone" />
   <records interface="Products.CMFPlone.interfaces.IUserGroupsSettingsSchema"
            prefix="plone" />
+  <records interface="Products.CMFPlone.interfaces.IImagingSchema"
+           prefix="plone" />
   <record interface="Products.ResourceRegistries.interfaces.settings.IResourceRegistriesSettings" field="resourceBundlesForThemes">
     <value purge="false">
       <element key="(default)">

Products/CMFPlone/utils.py

@@ -20,6 +20,7 @@
 from zope.deprecation import deprecated
 from zope.i18n import translate
 from zope.publisher.interfaces.browser import IBrowserRequest
+from zope import schema
 
 import OFS
 from AccessControl import getSecurityManager, Unauthorized
@@ -30,10 +31,10 @@
 from App.ImageFile import ImageFile
 from DateTime import DateTime
 from DateTime.interfaces import DateTimeError
-from Products.CMFCore.interfaces import IPropertiesTool
 from Products.CMFCore.permissions import ManageUsers
 from Products.CMFCore.utils import ToolInit as CMFCoreToolInit
 from Products.CMFCore.utils import getToolByName
+from Products.CMFPlone import PloneMessageFactory as _
 
 import transaction
 
@@ -62,8 +63,8 @@
 
 # Log methods
 from log import log
-from log import log_exc
-from log import log_deprecated
+from log import log_exc  # noqa
+from log import log_deprecated  # noqa
 
 _marker = []
 
@@ -125,7 +126,7 @@ def isIDAutoGenerated(context, id):
 
     pt = getToolByName(context, 'portal_types')
     portaltypes = pt.listContentTypes()
-    portaltypes.extend([pt.lower() for pt in portaltypes])
+    portaltypes.extend([t.lower() for t in portaltypes])
 
     try:
         parts = id.split('.')
@@ -135,8 +136,7 @@ def isIDAutoGenerated(context, id):
         type = ' '.join(obj_type.split('_'))
         # New autogenerated ids may have a lower case portal type
         if ((type in portaltypes or obj_type in portaltypes) and
-            DateTime(date_created) and
-            float(random_number)):
+                DateTime(date_created) and float(random_number)):
             return True
     except (ValueError, AttributeError, IndexError, DateTimeError):
         pass
@@ -182,9 +182,9 @@ def pretty_title_or_id(context, obj, empty_value=_marker):
        of whether obj is a catalog brain or an object, but returning an
        empty title marker if the id is not set (i.e. it's auto-generated).
     """
-    #if safe_hasattr(obj, 'aq_explicit'):
+    # if safe_hasattr(obj, 'aq_explicit'):
     #    obj = obj.aq_explicit
-    #title = getattr(obj, 'Title', None)
+    # title = getattr(obj, 'Title', None)
     title = None
     if base_hasattr(obj, 'Title'):
         title = getattr(obj, 'Title', None)
@@ -561,20 +561,20 @@ def _unrestricted_rename(container, id, new_id):
     try:
         container._checkId(new_id)
     except:
-        raise CopyError, MessageDialog(
-              title='Invalid Id',
-              message=sys.exc_info()[1],
-              action='manage_main')
+        raise CopyError(MessageDialog(
+            title='Invalid Id',
+            message=sys.exc_info()[1],
+            action='manage_main'))
     ob = container._getOb(id)
     if not ob.cb_isMoveable():
-        raise CopyError, eNotSupported % escape(id)
+        raise CopyError(eNotSupported % escape(id))
     try:
         ob._notifyOfCopyTo(container, op=1)
     except:
-        raise CopyError, MessageDialog(
-              title='Rename Error',
-              message=sys.exc_info()[1],
-              action='manage_main')
+        raise CopyError(MessageDialog(
+            title='Rename Error',
+            message=sys.exc_info()[1],
+            action='manage_main'))
     container._delObject(id)
     ob = aq_base(ob)
     ob._setId(new_id)
@@ -677,40 +677,8 @@ def set_own_login_name(member, loginname):
     pas.updateLoginName(member.getId(), loginname)
 
 
-def getAllowedSizes():
-    """Get image-scale sizes.
-    """
-    ptool = queryUtility(IPropertiesTool)
-    if ptool is None:
-        return None
-    props = getattr(ptool, 'imaging_properties', None)
-    if props is None:
-        return None
-    sizes = {}
-    for line in props.getProperty('allowed_sizes'):
-        line = line.strip()
-        if line:
-            name, width, height = pattern.match(line).groups()
-            name = name.strip().replace(' ', '_')
-            sizes[name] = int(width), int(height)
-    return sizes
-
-
-def getQuality():
-    """Get quality used in image-scaling
-    """
-    ptool = queryUtility(IPropertiesTool)
-    if ptool:
-        props = getattr(ptool, 'imaging_properties', None)
-        if props:
-            quality = props.getProperty('quality')
-            if quality:
-                return quality
-    return QUALITY_DEFAULT
-
-
 def ajax_load_url(url):
-    if url and not 'ajax_load' in url:
+    if url and 'ajax_load' not in url:
         sep = '?' in url and '&' or '?'  # url parameter seperator
         url = '%s%sajax_load=1' % (url, sep)
     return url
@@ -746,3 +714,14 @@ def bodyfinder(text):
     if bodyend == -1:
         return text
     return text[bodystart:bodyend]
+
+
+# XXX nasty? better than re-writting same method. Circular import issues here
+def getAllowedSizes():
+    from plone.app.imaging.utils import getAllowedSizes as func
+    return func()
+
+
+def getQuality():
+    from plone.app.imaging.utils import getQuality as func
+    return func()