[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22481] branches/blender2.5/blender: 2. 5 3DView:
Thomas Dinges
dingto at gmx.de
Sat Aug 15 22:21:50 CEST 2009
Revision: 22481
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22481
Author: dingto
Date: 2009-08-15 22:21:49 +0200 (Sat, 15 Aug 2009)
Log Message:
-----------
2.5 3DView:
* Renaming of edit mode context types.
* Code cleanup.
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/space_view3d.py
branches/blender2.5/blender/release/ui/space_view3d_toolbar.py
branches/blender2.5/blender/source/blender/blenkernel/intern/context.c
Modified: branches/blender2.5/blender/release/ui/space_view3d.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_view3d.py 2009-08-15 19:48:50 UTC (rev 22480)
+++ branches/blender2.5/blender/release/ui/space_view3d.py 2009-08-15 20:21:49 UTC (rev 22481)
@@ -1,46 +1,36 @@
import bpy
-# ********** Header ****************
+# ********** Header **********
class VIEW3D_HT_header(bpy.types.Header):
__space_type__ = "VIEW_3D"
def draw(self, context):
layout = self.layout
+
+ view = context.space_data
+ mode_string = context.mode_string
layout.template_header()
-
- # menus
+
+ # Menus
if context.area.show_menus:
row = layout.row()
+
row.itemM("VIEW3D_MT_view")
+
+ # Select Menu
+ selectmenu = "VIEW3D_MT_select_%s" % mode_string
+ if selectmenu in dir(bpy.types):
+ layout.itemM(selectmenu)
layout.template_header_3D()
-# ********** Menu ****************
+# ********** Menu **********
-class VIEW3D_MT_view_navigation(bpy.types.Menu):
- __space_type__ = "VIEW_3D"
- __label__ = "Navigation"
+# ********** View menus **********
- def draw(self, context):
- layout = self.layout
-
- # layout.itemO("view3d.view_fly_mode")
- # layout.itemS()
-
- layout.items_enumO("view3d.view_orbit", "type")
-
- layout.itemS()
-
- layout.items_enumO("view3d.view_pan", "type")
-
- layout.itemS()
-
- layout.item_floatO("view3d.zoom", "delta", 1.0, text="Zoom In")
- layout.item_floatO("view3d.zoom", "delta", -1.0, text="Zoom Out")
-
class VIEW3D_MT_view(bpy.types.Menu):
__space_type__ = "VIEW_3D"
__label__ = "View"
@@ -94,9 +84,30 @@
layout.itemO("screen.region_foursplit", text="Toggle Quad View")
layout.itemO("screen.screen_full_area", text="Toggle Full Screen")
+
+class VIEW3D_MT_view_navigation(bpy.types.Menu):
+ __space_type__ = "VIEW_3D"
+ __label__ = "Navigation"
-# ********** Select menus ****************
+ def draw(self, context):
+ layout = self.layout
+ # layout.itemO("view3d.view_fly_mode")
+ # layout.itemS()
+
+ layout.items_enumO("view3d.view_orbit", "type")
+
+ layout.itemS()
+
+ layout.items_enumO("view3d.view_pan", "type")
+
+ layout.itemS()
+
+ layout.item_floatO("view3d.zoom", "delta", 1.0, text="Zoom In")
+ layout.item_floatO("view3d.zoom", "delta", -1.0, text="Zoom Out")
+
+# ********** Select menus **********
+
class VIEW3D_MT_select_objectmode(bpy.types.Menu):
__space_type__ = "VIEW_3D"
__label__ = "Select"
@@ -161,7 +172,7 @@
layout.itemO("particle.select_more")
layout.itemO("particle.select_less")
-class VIEW3D_MT_select_meshedit(bpy.types.Menu):
+class VIEW3D_MT_select_mesh_edit(bpy.types.Menu):
__space_type__ = "VIEW_3D"
__label__ = "Select"
@@ -205,7 +216,7 @@
layout.itemO("mesh.loop_to_region")
layout.itemO("mesh.region_to_loop")
-class VIEW3D_MT_select_curveedit(bpy.types.Menu):
+class VIEW3D_MT_select_curve_edit(bpy.types.Menu):
__space_type__ = "VIEW_3D"
__label__ = "Select"
@@ -234,7 +245,7 @@
layout.itemO("curve.select_more")
layout.itemO("curve.select_less")
-class VIEW3D_MT_select_surfaceedit(bpy.types.Menu):
+class VIEW3D_MT_select_surface_edit(bpy.types.Menu):
__space_type__ = "VIEW_3D"
__label__ = "Select"
@@ -260,7 +271,7 @@
layout.itemO("curve.select_more")
layout.itemO("curve.select_less")
-class VIEW3D_MT_select_mballedit(bpy.types.Menu):
+class VIEW3D_MT_select_mball_edit(bpy.types.Menu):
__space_type__ = "VIEW_3D"
__label__ = "Select"
@@ -278,7 +289,7 @@
layout.itemL(text="Random")
-class VIEW3D_MT_select_latticeedit(bpy.types.Menu):
+class VIEW3D_MT_select_lattice_edit(bpy.types.Menu):
__space_type__ = "VIEW_3D"
__label__ = "Select"
@@ -291,7 +302,7 @@
layout.itemO("lattice.select_all_toggle", text="Select/Deselect All")
-class VIEW3D_MT_select_armatureedit(bpy.types.Menu):
+class VIEW3D_MT_select_armature_edit(bpy.types.Menu):
__space_type__ = "VIEW_3D"
__label__ = "Select"
@@ -323,30 +334,9 @@
layout.view3d_select_faceselmenu()
-class VIEW3D_HT_header(bpy.types.Header):
- __space_type__ = "VIEW_3D"
- def draw(self, context):
- view = context.space_data
- mode_string = context.mode_string
- layout = self.layout
+# ********** Panel **********
- layout.template_header()
-
- # menus
- if context.area.show_menus:
- row = layout.row()
-
- row.itemM("VIEW3D_MT_view")
-
- selectmenu = "VIEW3D_MT_select_%s" % mode_string
- if selectmenu in dir(bpy.types):
- layout.itemM(selectmenu)
-
- layout.template_header_3D()
-
-# ********** Panel ****************
-
class VIEW3D_PT_3dview_properties(bpy.types.Panel):
__space_type__ = "VIEW_3D"
__region_type__ = "UI"
@@ -448,19 +438,22 @@
col.itemR(bg, "x_offset", text="X")
col.itemR(bg, "y_offset", text="Y")
+bpy.types.register(VIEW3D_HT_header) # Header
+
+bpy.types.register(VIEW3D_MT_view) #View Menus
bpy.types.register(VIEW3D_MT_view_navigation)
-bpy.types.register(VIEW3D_MT_view)
-bpy.types.register(VIEW3D_MT_select_objectmode)
+
+bpy.types.register(VIEW3D_MT_select_objectmode) # Select Menus
bpy.types.register(VIEW3D_MT_select_posemode)
bpy.types.register(VIEW3D_MT_select_particlemode)
-bpy.types.register(VIEW3D_MT_select_meshedit)
-bpy.types.register(VIEW3D_MT_select_curveedit)
-bpy.types.register(VIEW3D_MT_select_surfaceedit)
-bpy.types.register(VIEW3D_MT_select_mballedit)
-bpy.types.register(VIEW3D_MT_select_latticeedit)
-bpy.types.register(VIEW3D_MT_select_armatureedit)
+bpy.types.register(VIEW3D_MT_select_mesh_edit)
+bpy.types.register(VIEW3D_MT_select_curve_edit)
+bpy.types.register(VIEW3D_MT_select_surface_edit)
+bpy.types.register(VIEW3D_MT_select_mball_edit)
+bpy.types.register(VIEW3D_MT_select_lattice_edit)
+bpy.types.register(VIEW3D_MT_select_armature_edit)
bpy.types.register(VIEW3D_MT_select_facesel)
-bpy.types.register(VIEW3D_HT_header)
-bpy.types.register(VIEW3D_PT_3dview_properties)
+
+bpy.types.register(VIEW3D_PT_3dview_properties) # Panels
bpy.types.register(VIEW3D_PT_3dview_display)
bpy.types.register(VIEW3D_PT_background_image)
Modified: branches/blender2.5/blender/release/ui/space_view3d_toolbar.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_view3d_toolbar.py 2009-08-15 19:48:50 UTC (rev 22480)
+++ branches/blender2.5/blender/release/ui/space_view3d_toolbar.py 2009-08-15 20:21:49 UTC (rev 22481)
@@ -1,7 +1,6 @@
import bpy
-
class View3DPanel(bpy.types.Panel):
__space_type__ = "VIEW_3D"
__region_type__ = "TOOLS"
@@ -45,7 +44,7 @@
# ********** default tools for editmode_mesh ****************
class VIEW3D_PT_tools_meshedit(View3DPanel):
- __context__ = "meshedit"
+ __context__ = "mesh_edit"
__label__ = "Mesh Tools"
def draw(self, context):
@@ -88,7 +87,7 @@
# ********** default tools for editmode_curve ****************
class VIEW3D_PT_tools_curveedit(View3DPanel):
- __context__ = "curveedit"
+ __context__ = "curve_edit"
__label__ = "Curve Tools"
def draw(self, context):
@@ -118,7 +117,7 @@
# ********** default tools for editmode_surface ****************
class VIEW3D_PT_tools_surfaceedit(View3DPanel):
- __context__ = "surfaceedit"
+ __context__ = "surface_edit"
__label__ = "Surface Tools"
def draw(self, context):
@@ -148,7 +147,7 @@
# ********** default tools for editmode_text ****************
class VIEW3D_PT_tools_textedit(View3DPanel):
- __context__ = "textedit"
+ __context__ = "text_edit"
__label__ = "Text Tools"
def draw(self, context):
@@ -165,7 +164,7 @@
# ********** default tools for editmode_armature ****************
class VIEW3D_PT_tools_armatureedit(View3DPanel):
- __context__ = "armatureedit"
+ __context__ = "armature_edit"
__label__ = "Armature Tools"
def draw(self, context):
@@ -191,7 +190,7 @@
# ********** default tools for editmode_mball ****************
class VIEW3D_PT_tools_mballedit(View3DPanel):
- __context__ = "mballedit"
+ __context__ = "mball_edit"
__label__ = "Meta Tools"
def draw(self, context):
@@ -207,7 +206,7 @@
# ********** default tools for editmode_lattice ****************
class VIEW3D_PT_tools_latticeedit(View3DPanel):
- __context__ = "latticeedit"
+ __context__ = "lattice_edit"
__label__ = "Lattice Tools"
def draw(self, context):
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/context.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/context.c 2009-08-15 19:48:50 UTC (rev 22480)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/context.c 2009-08-15 20:21:49 UTC (rev 22481)
@@ -668,19 +668,19 @@
if(obedit) {
switch(obedit->type) {
case OB_MESH:
- return "meshedit";
+ return "mesh_edit";
case OB_CURVE:
- return "curveedit";
+ return "curve_edit";
case OB_SURF:
- return "surfaceedit";
+ return "surface_edit";
case OB_FONT:
- return "textedit";
+ return "text_edit";
case OB_ARMATURE:
- return "armatureedit";
+ return "armature_edit";
case OB_MBALL:
- return "mballedit";
+ return "mball_edit";
case OB_LATTICE:
- return "latticeedit";
+ return "lattice_edit";
}
}
else {
More information about the Bf-blender-cvs
mailing list