[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25756] trunk/blender/release/scripts/io/ netrender: netrender: UI layout reorganization and prettifying.
Martin Poirier
theeth at yahoo.com
Tue Jan 5 21:47:23 CET 2010
Revision: 25756
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25756
Author: theeth
Date: 2010-01-05 21:47:23 +0100 (Tue, 05 Jan 2010)
Log Message:
-----------
netrender: UI layout reorganization and prettifying. Also better operator descriptions (tooltips). Based on a patch by DingTo.
Modified Paths:
--------------
trunk/blender/release/scripts/io/netrender/client.py
trunk/blender/release/scripts/io/netrender/operators.py
trunk/blender/release/scripts/io/netrender/ui.py
Modified: trunk/blender/release/scripts/io/netrender/client.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/client.py 2010-01-05 20:32:20 UTC (rev 25755)
+++ trunk/blender/release/scripts/io/netrender/client.py 2010-01-05 20:47:23 UTC (rev 25756)
@@ -276,6 +276,6 @@
except: pass
del module
-compatible("properties_render")
+#compatible("properties_render")
compatible("properties_world")
compatible("properties_material")
Modified: trunk/blender/release/scripts/io/netrender/operators.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/operators.py 2010-01-05 20:32:20 UTC (rev 25755)
+++ trunk/blender/release/scripts/io/netrender/operators.py 2010-01-05 20:47:23 UTC (rev 25756)
@@ -112,6 +112,23 @@
return self.execute(context)
@rnaType
+class RENDER_OT_netclientrun(bpy.types.Operator):
+ '''Start network rendering service'''
+ bl_idname = "render.netclientstart"
+ bl_label = "Start Service"
+
+ def poll(self, context):
+ return True
+
+ def execute(self, context):
+ bpy.ops.screen.render('INVOKE_AREA', animation=True)
+
+ return {'FINISHED'}
+
+ def invoke(self, context, event):
+ return self.execute(context)
+
+ at rnaType
class RENDER_OT_netclientsend(bpy.types.Operator):
'''Send Render Job to the Network'''
bl_idname = "render.netclientsend"
@@ -390,8 +407,7 @@
@rnaType
class netclientscan(bpy.types.Operator):
- __slots__ = []
- '''Operator documentation text, will be used for the operator tooltip and python docs.'''
+ '''Listen on network for master server broadcasting its address and port.'''
bl_idname = "render.netclientscan"
bl_label = "Client Scan"
@@ -410,7 +426,6 @@
return {'FINISHED'}
def invoke(self, context, event):
- print(dir(self))
return self.execute(context)
@rnaType
Modified: trunk/blender/release/scripts/io/netrender/ui.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/ui.py 2010-01-05 20:32:20 UTC (rev 25755)
+++ trunk/blender/release/scripts/io/netrender/ui.py 2010-01-05 20:47:23 UTC (rev 25756)
@@ -97,29 +97,32 @@
scene = context.scene
netsettings = scene.network_render
+
+ verify_address(netsettings)
- layout.active = True
+ layout.prop(netsettings, "mode", expand=True)
- split = layout.split()
+ if netsettings.mode in ("RENDER_MASTER", "RENDER_SLAVE"):
+ layout.operator("render.netclientstart", icon='PLAY')
+ layout.prop(netsettings, "path")
+
+ split = layout.split(percentage=0.7)
+
col = split.column()
-
- if netsettings.mode in ("RENDER_MASTER", "RENDER_SLAVE"):
- col.operator("screen.render", text="Start", icon='PLAY').animation = True
+ col.label(text="Server Adress:")
+ col.prop(netsettings, "server_address", text="")
- verify_address(netsettings)
+ col = split.column()
+ col.label(text="Port:")
+ col.prop(netsettings, "server_port", text="")
- col.prop(netsettings, "mode")
- col.prop(netsettings, "path")
- col.prop(netsettings, "server_address")
- col.prop(netsettings, "server_port")
-
if netsettings.mode == "RENDER_MASTER":
- col.prop(netsettings, "server_broadcast")
+ layout.prop(netsettings, "server_broadcast", text="Broadcast")
else:
- col.operator("render.netclientscan", icon='FILE_REFRESH', text="")
+ layout.operator("render.netclientscan", icon='FILE_REFRESH', text="")
- col.operator("render.netclientweb", icon='QUESTION')
+ layout.operator("render.netclientweb", icon='QUESTION')
@rnaType
class RENDER_PT_network_job(RenderButtonsPanel):
@@ -137,22 +140,27 @@
scene = context.scene
netsettings = scene.network_render
- layout.active = True
-
- split = layout.split()
-
- col = split.column()
-
verify_address(netsettings)
if netsettings.server_address != "[default]":
- col.operator("render.netclientanim", icon='RENDER_ANIMATION')
- col.operator("render.netclientsend", icon='FILE_BLEND')
+ layout.operator("render.netclientanim", icon='RENDER_ANIMATION')
+ layout.operator("render.netclientsend", icon='FILE_BLEND')
if netsettings.job_id:
- col.operator("screen.render", text="Get Results", icon='RENDER_ANIMATION').animation = True
- col.prop(netsettings, "job_name")
- col.prop(netsettings, "job_category")
- row = col.row()
+ row = layout.row()
+ row.operator("screen.render", text="Get Image", icon='RENDER_STILL')
+ row.operator("screen.render", text="Get Animation", icon='RENDER_ANIMATION').animation = True
+
+ split = layout.split(percentage=0.3)
+
+ col = split.column()
+ col.label(text="Name:")
+ col.label(text="Category:")
+
+ col = split.column()
+ col.prop(netsettings, "job_name", text="")
+ col.prop(netsettings, "job_category", text="")
+
+ row = layout.row()
row.prop(netsettings, "priority")
row.prop(netsettings, "chunks")
More information about the Bf-blender-cvs
mailing list