archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge with trunk r40782

Browse Source
This commit is contained in:
Miika Hamalainen
2011-10-04 11:42:44 +00:00
parent 9e9b26b8ba 019dca9c54
commit e8bb972f3c
508 changed files with 16063 additions and 15627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
release/scripts/startup/bl_ui/space_time.py
View File

@@ -19,7 +19,6 @@
# <pep8 compliant>
import bpy
from bpy.types import Header, Menu
from blf import gettext as _
class TIME_HT_header(Header):
@@ -44,11 +43,11 @@ class TIME_HT_header(Header):
row = layout.row(align=True)
if not scene.use_preview_range:
row.prop(scene, "frame_start", text=_("Start"))
row.prop(scene, "frame_end", text=_("End"))
row.prop(scene, "frame_start", text="Start")
row.prop(scene, "frame_end", text="End")
else:
row.prop(scene, "frame_preview_start", text=_("Start"))
row.prop(scene, "frame_preview_end", text=_("End"))
row.prop(scene, "frame_preview_start", text="Start")
row.prop(scene, "frame_preview_end", text="End")
layout.prop(scene, "frame_current", text="")
@@ -144,14 +143,14 @@ class TIME_MT_frame(Menu):
def draw(self, context):
layout = self.layout
layout.operator("marker.add", text=_("Add Marker"))
layout.operator("marker.duplicate", text=_("Duplicate Marker"))
layout.operator("marker.delete", text=_("Delete Marker"))
layout.operator("marker.add", text="Add Marker")
layout.operator("marker.duplicate", text="Duplicate Marker")
layout.operator("marker.delete", text="Delete Marker")
layout.separator()
layout.operator("marker.rename", text=_("Rename Marker"))
layout.operator("marker.move", text=_("Grab/Move Marker"))
layout.operator("marker.rename", text="Rename Marker")
layout.operator("marker.move", text="Grab/Move Marker")
layout.separator()
@@ -183,8 +182,8 @@ class TIME_MT_playback(Menu):
layout.separator()
layout.prop(scene, "use_frame_drop", text=_("Frame Dropping"))
layout.prop(scene, "use_audio_sync", text=_("AV-sync"), icon='SPEAKER')
layout.prop(scene, "use_frame_drop", text="Frame Dropping")
layout.prop(scene, "use_audio_sync", text="AV-sync", icon='SPEAKER')
layout.prop(scene, "use_audio")
layout.prop(scene, "use_audio_scrub")