Merge from trunk -r 23968:24181.
[blender.git] / release / scripts / ui / space_info.py
index a30d77a575ac19cdaa78a01bc4df2e6c795724e1..d4fcbbcdd4d498b5a9c0806f1468243733f0e920 100644 (file)
@@ -39,7 +39,8 @@ class INFO_HT_header(bpy.types.Header):
                layout.template_running_jobs()
 
                layout.itemL(text=scene.statistics())
-
+               
+               layout.itemO("wm.window_fullscreen_toggle", icon='ICON_ARROW_LEFTRIGHT', text="")
 
 class INFO_MT_file(bpy.types.Menu):
        __label__ = "File"
@@ -53,6 +54,7 @@ class INFO_MT_file(bpy.types.Menu):
                layout.itemO("wm.open_mainfile", text="Open...", icon='ICON_FILE_FOLDER')
                layout.item_menu_enumO("wm.open_recentfile", "file", text="Open Recent")
                layout.itemO("wm.recover_last_session")
+               layout.itemO("wm.recover_auto_save", text="Recover Auto Save...")
 
                layout.itemS()
 
@@ -80,7 +82,6 @@ class INFO_MT_file(bpy.types.Menu):
                layout.operator_context = "EXEC_AREA"
                layout.itemO("wm.exit_blender", text="Quit", icon='ICON_QUIT')
 
-
 # test for expanding menus
 '''
 class INFO_MT_file_more(INFO_MT_file):
@@ -122,7 +123,6 @@ class INFO_MT_file_external_data(bpy.types.Menu):
                layout.itemO("file.report_missing_files")
                layout.itemO("file.find_missing_files")
 
-
 class INFO_MT_mesh_add(dynamic_menu.DynMenu):
        __label__ = "Mesh"
        def draw(self, context):
@@ -133,7 +133,7 @@ class INFO_MT_mesh_add(dynamic_menu.DynMenu):
                layout.itemO("mesh.primitive_circle_add", icon='ICON_MESH_CIRCLE', text="Circle")
                layout.itemO("mesh.primitive_uv_sphere_add", icon='ICON_MESH_UVSPHERE', text="UV Sphere")
                layout.itemO("mesh.primitive_ico_sphere_add", icon='ICON_MESH_ICOSPHERE', text="Icosphere")
-               layout.itemO("mesh.primitive_cylinder_add", icon='ICON_MESH_TUBE', text="Tube")
+               layout.itemO("mesh.primitive_tube_add", icon='ICON_MESH_TUBE', text="Tube")
                layout.itemO("mesh.primitive_cone_add", icon='ICON_MESH_CONE', text="Cone")
                layout.itemS()
                layout.itemO("mesh.primitive_grid_add", icon='ICON_MESH_GRID', text="Grid")
@@ -204,6 +204,11 @@ class INFO_MT_render(bpy.types.Menu):
 
                layout.itemS()
 
+               layout.itemO("screen.opengl_render", text="OpenGL Render Image")
+               layout.item_booleanO("screen.opengl_render", "animation", True, text="OpenGL Render Animation")
+
+               layout.itemS()
+
                layout.itemO("screen.render_view_show")
 
 class INFO_MT_help(bpy.types.Menu):
@@ -222,6 +227,8 @@ class INFO_MT_help(bpy.types.Menu):
                layout.itemO("help.developer_community", icon='ICON_URL')
                layout.itemO("help.user_community", icon='ICON_URL')
                layout.itemS()
+               layout.itemO("help.report_bug", icon='ICON_URL')
+               layout.itemS()
                layout.itemO("help.operator_cheat_sheet")
 
 bpy.types.register(INFO_HT_header)
@@ -239,14 +246,8 @@ bpy.types.register(INFO_MT_help)
 
 class HelpOperator(bpy.types.Operator):
        def execute(self, context):
-               try: import webbrowser
-               except: webbrowser = None
-
-               if webbrowser:
-                       webbrowser.open(self.__URL__)
-               else:
-                       raise Exception("Operator requires a full Python installation")
-
+               import webbrowser
+               webbrowser.open(self.__URL__)
                return ('FINISHED',)
 
 class HELP_OT_manual(HelpOperator):
@@ -284,6 +285,12 @@ class HELP_OT_user_community(HelpOperator):
        __idname__ = "help.user_community"
        __label__ = "User Community"
        __URL__ = 'http://www.blender.org/community/user-community/'
+       
+class HELP_OT_report_bug(HelpOperator):
+       '''Report a bug in the Blender bug tracker'''
+       __idname__ = "help.report_bug"
+       __label__ = "Report a Bug"
+       __URL__ = 'http://projects.blender.org/tracker/?atid=498&group_id=9&func=browse'
 
 class HELP_OT_operator_cheat_sheet(bpy.types.Operator):
        __idname__ = "help.operator_cheat_sheet"
@@ -316,4 +323,5 @@ bpy.ops.add(HELP_OT_blender_website)
 bpy.ops.add(HELP_OT_blender_eshop)
 bpy.ops.add(HELP_OT_developer_community)
 bpy.ops.add(HELP_OT_user_community)
+bpy.ops.add(HELP_OT_report_bug)
 bpy.ops.add(HELP_OT_operator_cheat_sheet)