[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25599] trunk/blender/release/scripts/io/ netrender: netrender: show web interface button in all modes.
Martin Poirier
theeth at yahoo.com
Mon Dec 28 23:49:23 CET 2009
Revision: 25599
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25599
Author: theeth
Date: 2009-12-28 23:49:22 +0100 (Mon, 28 Dec 2009)
Log Message:
-----------
netrender: show web interface button in all modes. use rna decorator all the time (no need for special operator decorator)
Modified Paths:
--------------
trunk/blender/release/scripts/io/netrender/operators.py
trunk/blender/release/scripts/io/netrender/ui.py
trunk/blender/release/scripts/io/netrender/utils.py
Modified: trunk/blender/release/scripts/io/netrender/operators.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/operators.py 2009-12-28 22:48:10 UTC (rev 25598)
+++ trunk/blender/release/scripts/io/netrender/operators.py 2009-12-28 22:49:22 UTC (rev 25599)
@@ -26,7 +26,7 @@
import netrender.client as client
import netrender.model
- at rnaOperator
+ at rnaType
class RENDER_OT_netslave_bake(bpy.types.Operator):
'''NEED DESCRIPTION'''
bl_idname = "render.netslavebake"
@@ -84,7 +84,7 @@
def invoke(self, context, event):
return self.execute(context)
- at rnaOperator
+ at rnaType
class RENDER_OT_netclientanim(bpy.types.Operator):
'''Start rendering an animation on network'''
bl_idname = "render.netclientanim"
@@ -111,7 +111,7 @@
def invoke(self, context, event):
return self.execute(context)
- at rnaOperator
+ at rnaType
class RENDER_OT_netclientsend(bpy.types.Operator):
'''Send Render Job to the Network'''
bl_idname = "render.netclientsend"
@@ -141,7 +141,7 @@
def invoke(self, context, event):
return self.execute(context)
- at rnaOperator
+ at rnaType
class RENDER_OT_netclientstatus(bpy.types.Operator):
'''Refresh the status of the current jobs'''
bl_idname = "render.netclientstatus"
@@ -181,7 +181,7 @@
def invoke(self, context, event):
return self.execute(context)
- at rnaOperator
+ at rnaType
class RENDER_OT_netclientblacklistslave(bpy.types.Operator):
'''Operator documentation text, will be used for the operator tooltip and python docs.'''
bl_idname = "render.netclientblacklistslave"
@@ -211,7 +211,7 @@
def invoke(self, context, event):
return self.execute(context)
- at rnaOperator
+ at rnaType
class RENDER_OT_netclientwhitelistslave(bpy.types.Operator):
'''Operator documentation text, will be used for the operator tooltip and python docs.'''
bl_idname = "render.netclientwhitelistslave"
@@ -242,7 +242,7 @@
return self.execute(context)
- at rnaOperator
+ at rnaType
class RENDER_OT_netclientslaves(bpy.types.Operator):
'''Refresh status about available Render slaves'''
bl_idname = "render.netclientslaves"
@@ -287,7 +287,7 @@
def invoke(self, context, event):
return self.execute(context)
- at rnaOperator
+ at rnaType
class RENDER_OT_netclientcancel(bpy.types.Operator):
'''Cancel the selected network rendering job.'''
bl_idname = "render.netclientcancel"
@@ -316,7 +316,7 @@
def invoke(self, context, event):
return self.execute(context)
- at rnaOperator
+ at rnaType
class RENDER_OT_netclientcancelall(bpy.types.Operator):
'''Cancel all running network rendering jobs.'''
bl_idname = "render.netclientcancelall"
@@ -343,7 +343,7 @@
def invoke(self, context, event):
return self.execute(context)
- at rnaOperator
+ at rnaType
class netclientdownload(bpy.types.Operator):
'''Download render results from the network'''
bl_idname = "render.netclientdownload"
@@ -388,15 +388,16 @@
def invoke(self, context, event):
return self.execute(context)
- at rnaOperator
+ at rnaType
class netclientscan(bpy.types.Operator):
+ __slots__ = []
'''Operator documentation text, will be used for the operator tooltip and python docs.'''
bl_idname = "render.netclientscan"
bl_label = "Client Scan"
def poll(self, context):
return True
-
+
def execute(self, context):
address, port = clientScan(self.report)
@@ -409,16 +410,18 @@
return {'FINISHED'}
def invoke(self, context, event):
+ print(dir(self))
return self.execute(context)
- at rnaOperator
+ at rnaType
class netclientweb(bpy.types.Operator):
'''Open new window with information about running rendering jobs'''
bl_idname = "render.netclientweb"
bl_label = "Open Master Monitor"
def poll(self, context):
- return True
+ netsettings = context.scene.network_render
+ return netsettings.server_address != "[default]"
def execute(self, context):
netsettings = context.scene.network_render
Modified: trunk/blender/release/scripts/io/netrender/ui.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/ui.py 2009-12-28 22:48:10 UTC (rev 25598)
+++ trunk/blender/release/scripts/io/netrender/ui.py 2009-12-28 22:49:22 UTC (rev 25599)
@@ -78,6 +78,8 @@
else:
col.operator("render.netclientscan", icon='FILE_REFRESH', text="")
+ col.operator("render.netclientweb", icon='QUESTION')
+
@rnaType
class RENDER_PT_network_job(RenderButtonsPanel):
bl_label = "Job Settings"
@@ -104,7 +106,6 @@
col.operator("render.netclientsend", icon='FILE_BLEND')
if scene.network_render.job_id:
col.operator("screen.render", text="Get Results", icon='RENDER_ANIMATION').animation = True
- col.operator("render.netclientweb", icon='QUESTION')
col.prop(scene.network_render, "job_name")
col.prop(scene.network_render, "job_category")
row = col.row()
Modified: trunk/blender/release/scripts/io/netrender/utils.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/utils.py 2009-12-28 22:48:10 UTC (rev 25598)
+++ trunk/blender/release/scripts/io/netrender/utils.py 2009-12-28 22:49:22 UTC (rev 25599)
@@ -61,10 +61,6 @@
if bpy: bpy.types.register(rna_type)
return rna_type
-def rnaOperator(rna_op):
- if bpy: bpy.types.register(rna_op)
- return rna_op
-
def reporting(report, message, errorType = None):
if errorType:
t = 'ERROR'
More information about the Bf-blender-cvs
mailing list