Update Renderfarm.fi uploader for the great property changes from Campbell Barton

1 files changed, 27 insertions, 25 deletions

diff --git a/render_renderfarmfi.py b/render_renderfarmfi.py
index 5a90e28c..34998a8e 100644
--- a/render_renderfarmfi.py
+++ b/render_renderfarmfi.py
@@ -43,6 +43,8 @@ import xmlrpc.client
 import math
 from os.path import abspath, isabs, join, isfile
 
+from bpy.props import PointerProperty, StringProperty, BoolProperty, EnumProperty, IntProperty, CollectionProperty
+
 bpy.CURRENT_VERSION = bl_addon_info["version"][0]
 bpy.found_newer_version = False
 bpy.up_to_date = False
@@ -77,32 +79,32 @@ class ORESettings(bpy.types.IDPropertyGroup):
     pass
 
 # entry point for settings collection
-bpy.types.Scene.PointerProperty(attr='ore_render', type=ORESettings, name='ORE Render', description='ORE Render Settings')
+bpy.types.Scene.ore_render = PointerProperty(type=ORESettings, name='ORE Render', description='ORE Render Settings')
 
 # fill the new struct
-ORESettings.StringProperty(attr='username', name='E-mail', description='E-mail for Renderfarm.fi', maxlen=256, default='')
-ORESettings.StringProperty(attr='password', name='Password', description='Renderfarm.fi password', maxlen=256, default='')
-ORESettings.StringProperty(attr='hash', name='Hash', description='hash calculated out of credentials', maxlen=33, default='')
-
-ORESettings.StringProperty(attr='shortdesc', name='Short description', description='A short description of the scene (100 characters)', maxlen=101, default='')
-ORESettings.StringProperty(attr='longdesc', name='Long description', description='A more elaborate description of the scene (2k)', maxlen=2048, default='')
-ORESettings.StringProperty(attr='title', name='Title', description='Title for this session (128 characters)', maxlen=128, default='')
-ORESettings.StringProperty(attr='url', name='Project URL', description='Project URL. Leave empty if not applicable', maxlen=256, default='')
-
-ORESettings.IntProperty(attr='parts', name='Parts/Frame', description='', min=1, max=1000, soft_min=1, soft_max=64, default=1)
-ORESettings.IntProperty(attr='resox', name='Resolution X', description='X of render', min=1, max=10000, soft_min=1, soft_max=10000, default=1920)
-ORESettings.IntProperty(attr='resoy', name='Resolution Y', description='Y of render', min=1, max=10000, soft_min=1, soft_max=10000, default=1080)
-ORESettings.IntProperty(attr='memusage', name='Memory Usage', description='Estimated maximum memory usage during rendering in MB', min=1, max=6*1024, soft_min=1, soft_max=3*1024, default=256)
-ORESettings.IntProperty(attr='start', name='Start Frame', description='Start Frame', default=1)
-ORESettings.IntProperty(attr='end', name='End Frame', description='End Frame', default=250)
-ORESettings.IntProperty(attr='fps', name='FPS', description='FPS', min=1, max=256, default=25)
-
-ORESettings.BoolProperty(attr='prepared', name='Prepared', description='Set to True if preparation has been run', default=False)
-ORESettings.BoolProperty(attr='debug', name='Debug', description='Verbose output in console', default=False)
-ORESettings.IntProperty(attr='selected_session', name='Selected Session', description='The selected session', default=0)
+ORESettings.username = StringProperty(name='E-mail', description='E-mail for Renderfarm.fi', maxlen=256, default='')
+ORESettings.password = StringProperty(name='Password', description='Renderfarm.fi password', maxlen=256, default='')
+ORESettings.hash = StringProperty(name='Hash', description='hash calculated out of credentials', maxlen=33, default='')
+
+ORESettings.shortdesc = StringProperty(name='Short description', description='A short description of the scene (100 characters)', maxlen=101, default='')
+ORESettings.longdesc = StringProperty(name='Long description', description='A more elaborate description of the scene (2k)', maxlen=2048, default='')
+ORESettings.title = StringProperty(name='Title', description='Title for this session (128 characters)', maxlen=128, default='')
+ORESettings.url = StringProperty(name='Project URL', description='Project URL. Leave empty if not applicable', maxlen=256, default='')
+
+ORESettings.parts = IntProperty(name='Parts/Frame', description='', min=1, max=1000, soft_min=1, soft_max=64, default=1)
+ORESettings.resox = IntProperty(name='Resolution X', description='X of render', min=1, max=10000, soft_min=1, soft_max=10000, default=1920)
+ORESettings.resoy = IntProperty(name='Resolution Y', description='Y of render', min=1, max=10000, soft_min=1, soft_max=10000, default=1080)
+ORESettings.memusage = IntProperty(name='Memory Usage', description='Estimated maximum memory usage during rendering in MB', min=1, max=6*1024, soft_min=1, soft_max=3*1024, default=256)
+ORESettings.start = IntProperty(name='Start Frame', description='Start Frame', default=1)
+ORESettings.end = IntProperty(name='End Frame', description='End Frame', default=250)
+ORESettings.fps = IntProperty(name='FPS', description='FPS', min=1, max=256, default=25)
+
+ORESettings.prepared = BoolProperty(name='Prepared', description='Set to True if preparation has been run', default=False)
+ORESettings.debug = BoolProperty(name='Debug', description='Verbose output in console', default=False)
+ORESettings.selected_session = IntProperty(name='Selected Session', description='The selected session', default=0)
 
 # session struct
-ORESession.StringProperty(attr='name', name='Name', description='Name of the session', maxlen=128, default='[session]')
+ORESession.name = StringProperty(name='Name', description='Name of the session', maxlen=128, default='[session]')
 
 licenses =  (
         ('1', 'CC by-nc-nd', 'Creative Commons: Attribution Non-Commercial No Derivatives'),
@@ -113,10 +115,10 @@ licenses =  (
         ('6', 'CC by', 'Creative Commons: Attribution'),
         ('7', 'Copyright', 'Copyright, no license specified'),
         )
-ORESettings.EnumProperty(attr='inlicense', items=licenses, name='source license', description='license speficied for the source files', default='1')
-ORESettings.EnumProperty(attr='outlicense', items=licenses, name='output license', description='license speficied for the output files', default='1')
+ORESettings.inlicense = EnumProperty(items=licenses, name='source license', description='license speficied for the source files', default='1')
+ORESettings.outlicense = EnumProperty(items=licenses, name='output license', description='license speficied for the output files', default='1')
 
-ORESettings.CollectionProperty(attr='sessions', type=ORESession, name='Sessions', description='Sessions on Renderfarm.fi')
+ORESettings.sessions = CollectionProperty(type=ORESession, name='Sessions', description='Sessions on Renderfarm.fi')
         
 # all panels, except render panel
 # Example of wrapping every class 'as is'