From 27797a45ee6cbc987350269e6827197f47daf036 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Fri, 21 Aug 2009 11:52:20 +0000 Subject: [PATCH] 2.5: * Deleted Help scripts, there are now operators in space_info.py. * Some code cleanup. --- release/scripts/help_getting_started.py | 50 ------------------------- release/scripts/help_manual.py | 48 ------------------------ release/scripts/help_release_notes.py | 47 ----------------------- release/scripts/help_tutorials.py | 47 ----------------------- release/scripts/help_web_blender.py | 48 ------------------------ release/scripts/help_web_devcomm.py | 47 ----------------------- release/scripts/help_web_eshop.py | 47 ----------------------- release/scripts/help_web_usercomm.py | 47 ----------------------- release/ui/space_filebrowser.py | 5 +-- release/ui/space_info.py | 20 +++++----- 10 files changed, 12 insertions(+), 394 deletions(-) delete mode 100644 release/scripts/help_getting_started.py delete mode 100644 release/scripts/help_manual.py delete mode 100644 release/scripts/help_release_notes.py delete mode 100644 release/scripts/help_tutorials.py delete mode 100644 release/scripts/help_web_blender.py delete mode 100644 release/scripts/help_web_devcomm.py delete mode 100644 release/scripts/help_web_eshop.py delete mode 100644 release/scripts/help_web_usercomm.py diff --git a/release/scripts/help_getting_started.py b/release/scripts/help_getting_started.py deleted file mode 100644 index 77dda2cf88f..00000000000 --- a/release/scripts/help_getting_started.py +++ /dev/null @@ -1,50 +0,0 @@ -#!BPY -""" -Name: 'Getting Started' -Blender: 248 -Group: 'Help' -Tooltip: 'Help for new users' -""" - -__author__ = "Matt Ebb" -__url__ = ("blender", "blenderartists.org") -__version__ = "1.0.1" -__bpydoc__ = """\ -This script opens the user's default web browser at www.blender.org's -"Getting Started" page. -""" - -# $Id$ -# -# -------------------------------------------------------------------------- -# Getting Started Help Menu Item -# -------------------------------------------------------------------------- -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# ***** END GPL LICENCE BLOCK ***** -# -------------------------------------------------------------------------- - -import Blender -try: import webbrowser -except: webbrowser = None - -if webbrowser: - webbrowser.open('http://www.blender.org/education-help/tutorials/getting-started/') -else: - Blender.Draw.PupMenu("Error%t|This script requires a full python installation") - - diff --git a/release/scripts/help_manual.py b/release/scripts/help_manual.py deleted file mode 100644 index 27900040eb4..00000000000 --- a/release/scripts/help_manual.py +++ /dev/null @@ -1,48 +0,0 @@ -#!BPY -""" -Name: 'Manual' -Blender: 248 -Group: 'Help' -Tooltip: 'The Blender Wiki manual' -""" - -__author__ = "Matt Ebb" -__url__ = ("blender", "blenderartists.org") -__version__ = "1.0.1" -__bpydoc__ = """\ -This script opens the user's default web browser at www.blender.org's -"Manual" page. -""" - -# -------------------------------------------------------------------------- -# Manual Help Menu Item -# -------------------------------------------------------------------------- -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# ***** END GPL LICENCE BLOCK ***** -# -------------------------------------------------------------------------- - -import Blender -try: import webbrowser -except: webbrowser = None - -if webbrowser: - webbrowser.open('http://wiki.blender.org/index.php/Manual') -else: - Blender.Draw.PupMenu("Error%t|This script requires a full python installation") - - diff --git a/release/scripts/help_release_notes.py b/release/scripts/help_release_notes.py deleted file mode 100644 index 870f2391487..00000000000 --- a/release/scripts/help_release_notes.py +++ /dev/null @@ -1,47 +0,0 @@ -#!BPY -""" -Name: 'Release Logs' -Blender: 248 -Group: 'Help' -Tooltip: 'Information about the changes in this version of Blender' -""" - -__author__ = "Matt Ebb" -__url__ = ("blender", "blenderartists.org") -__version__ = "1.0.1" -__bpydoc__ = """\ -This script opens the user's default web browser at www.blender.org's -"Release Logs" page. -""" - -# -------------------------------------------------------------------------- -# Release Notes Help Menu Item -# -------------------------------------------------------------------------- -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# ***** END GPL LICENCE BLOCK ***** -# -------------------------------------------------------------------------- - -import Blender -try: import webbrowser -except: webbrowser = None - -if webbrowser: - webbrowser.open('http://www.blender.org/development/release-logs/') -else: - Blender.Draw.PupMenu("Error%t|This script requires a full python installation") - diff --git a/release/scripts/help_tutorials.py b/release/scripts/help_tutorials.py deleted file mode 100644 index e0cef1abdbf..00000000000 --- a/release/scripts/help_tutorials.py +++ /dev/null @@ -1,47 +0,0 @@ -#!BPY - -""" -Name: 'Tutorials' -Blender: 248 -Group: 'Help' -Tooltip: 'Tutorials for learning to use Blender' -""" - -__author__ = "Matt Ebb" -__url__ = ("blender", "blenderartists.org") -__version__ = "1.0.1" -__bpydoc__ = """\ -This script opens the user's default web browser at www.blender.org's -"Tutorials" page. -""" - -# -------------------------------------------------------------------------- -# Tutorials Help Menu Item -# -------------------------------------------------------------------------- -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# ***** END GPL LICENCE BLOCK ***** -# -------------------------------------------------------------------------- - -import Blender -try: import webbrowser -except: webbrowser = None - -if webbrowser: - webbrowser.open('http://www.blender.org/education-help/tutorials/') -else: - Blender.Draw.PupMenu("Error%t|This script requires a full python installation") diff --git a/release/scripts/help_web_blender.py b/release/scripts/help_web_blender.py deleted file mode 100644 index 2a0f90844ae..00000000000 --- a/release/scripts/help_web_blender.py +++ /dev/null @@ -1,48 +0,0 @@ -#!BPY - -""" -Name: 'Blender Website' -Blender: 248 -Group: 'HelpWebsites' -Tooltip: 'The official Blender website' -""" - -__author__ = "Matt Ebb" -__url__ = ("blender", "blenderartists.org") -__version__ = "1.0.1" -__bpydoc__ = """\ -This script opens the user's default web browser at Blender's main site, -www.blender.org. -""" - - -# -------------------------------------------------------------------------- -# Blender Website Help Menu -> Websites Item -# -------------------------------------------------------------------------- -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# ***** END GPL LICENCE BLOCK ***** -# -------------------------------------------------------------------------- - -import Blender -try: import webbrowser -except: webbrowser = None - -if webbrowser: - webbrowser.open('http://www.blender.org/') -else: - Blender.Draw.PupMenu("Error%t|This script requires a full python installation") diff --git a/release/scripts/help_web_devcomm.py b/release/scripts/help_web_devcomm.py deleted file mode 100644 index 46fa2487a89..00000000000 --- a/release/scripts/help_web_devcomm.py +++ /dev/null @@ -1,47 +0,0 @@ -#!BPY - -""" -Name: 'Developer Community' -Blender: 248 -Group: 'HelpWebsites' -Tooltip: 'Get involved with Blender development' -""" - -__author__ = "Matt Ebb" -__url__ = ("blender", "blenderartists.org") -__version__ = "1.0.1" -__bpydoc__ = """\ -This script opens the user's default web browser at www.blender.org's -"Get Involved" page. -""" - -# -------------------------------------------------------------------------- -# Blender Website Help Menu -> Websites Item -# -------------------------------------------------------------------------- -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# ***** END GPL LICENCE BLOCK ***** -# -------------------------------------------------------------------------- - -import Blender -try: import webbrowser -except: webbrowser = None - -if webbrowser: - webbrowser.open('http://www.blender.org/community/get-involved/') -else: - Blender.Draw.PupMenu("Error%t|This script requires a full python installation") diff --git a/release/scripts/help_web_eshop.py b/release/scripts/help_web_eshop.py deleted file mode 100644 index e40795b3a0d..00000000000 --- a/release/scripts/help_web_eshop.py +++ /dev/null @@ -1,47 +0,0 @@ -#!BPY - -""" -Name: 'Blender E-Shop' -Blender: 248 -Group: 'HelpWebsites' -Tooltip: 'Buy official Blender resources and merchandise online' -""" - -__author__ = "Matt Ebb" -__url__ = ("blender", "blenderartists.org") -__version__ = "1.0.1" -__bpydoc__ = """\ -This script opens the user's default web browser at www.blender.org's -"E-Shop" section. -""" - -# -------------------------------------------------------------------------- -# Blender Website Help Menu -> Websites Item -# -------------------------------------------------------------------------- -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# ***** END GPL LICENCE BLOCK ***** -# -------------------------------------------------------------------------- - -import Blender -try: import webbrowser -except: webbrowser = None - -if webbrowser: - webbrowser.open('http://www.blender3d.org/e-shop') -else: - Blender.Draw.PupMenu("Error%t|This script requires a full python installation") diff --git a/release/scripts/help_web_usercomm.py b/release/scripts/help_web_usercomm.py deleted file mode 100644 index dda5e42f34e..00000000000 --- a/release/scripts/help_web_usercomm.py +++ /dev/null @@ -1,47 +0,0 @@ -#!BPY - -""" -Name: 'User Community' -Blender: 248 -Group: 'HelpWebsites' -Tooltip: 'Get involved with other Blender users' -""" - -__author__ = "Matt Ebb" -__url__ = ("blender", "blenderartists.org") -__version__ = "1.0.1" -__bpydoc__ = """\ -This script opens the user's default web browser at www.blender.org's -"User Community" page. -""" - -# -------------------------------------------------------------------------- -# Blender Website Help Menu -> Websites Item -# -------------------------------------------------------------------------- -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# ***** END GPL LICENCE BLOCK ***** -# -------------------------------------------------------------------------- - -import Blender -try: import webbrowser -except: webbrowser = None - -if webbrowser: - webbrowser.open('http://www.blender.org/community/user-community/') -else: - Blender.Draw.PupMenu("Error%t|This script requires a full python installation") diff --git a/release/ui/space_filebrowser.py b/release/ui/space_filebrowser.py index 51a8f3f78e8..a37b89e8db4 100644 --- a/release/ui/space_filebrowser.py +++ b/release/ui/space_filebrowser.py @@ -1,15 +1,15 @@ import bpy - class FILEBROWSER_HT_header(bpy.types.Header): __space_type__ = "FILE_BROWSER" def draw(self, context): - st = context.space_data layout = self.layout + st = context.space_data params = st.params + layout.template_header(menus=False) row = layout.row(align=True) @@ -39,5 +39,4 @@ class FILEBROWSER_HT_header(bpy.types.Header): row.active = params.do_filter - bpy.types.register(FILEBROWSER_HT_header) diff --git a/release/ui/space_info.py b/release/ui/space_info.py index 1a3f9a321ac..83eb2c75a2c 100644 --- a/release/ui/space_info.py +++ b/release/ui/space_info.py @@ -115,22 +115,22 @@ class INFO_MT_add(bpy.types.Menu): layout.operator_context = "EXEC_SCREEN" - layout.item_menu_enumO( "OBJECT_OT_mesh_add", "type", text="Mesh", icon='ICON_OUTLINER_OB_MESH') - layout.item_menu_enumO( "OBJECT_OT_curve_add", "type", text="Curve", icon='ICON_OUTLINER_OB_CURVE') - layout.item_menu_enumO( "OBJECT_OT_surface_add", "type", text="Surface", icon='ICON_OUTLINER_OB_SURFACE') - layout.item_menu_enumO( "OBJECT_OT_metaball_add", "type", 'META', icon='ICON_OUTLINER_OB_META') - layout.itemO("OBJECT_OT_text_add", text="Text", icon='ICON_OUTLINER_OB_FONT') + layout.item_menu_enumO( "object.mesh_add", "type", text="Mesh", icon='ICON_OUTLINER_OB_MESH') + layout.item_menu_enumO( "object.curve_add", "type", text="Curve", icon='ICON_OUTLINER_OB_CURVE') + layout.item_menu_enumO( "object.surface_add", "type", text="Surface", icon='ICON_OUTLINER_OB_SURFACE') + layout.item_menu_enumO( "object.metaball_add", "type", 'META', icon='ICON_OUTLINER_OB_META') + layout.itemO("object.text_add", text="Text", icon='ICON_OUTLINER_OB_FONT') layout.itemS() - layout.itemO("OBJECT_OT_armature_add", text="Armature", icon='ICON_OUTLINER_OB_ARMATURE') - layout.item_enumO("OBJECT_OT_object_add", "type", 'LATTICE', icon='ICON_OUTLINER_OB_LATTICE') - layout.item_enumO("OBJECT_OT_object_add", "type", 'EMPTY', icon='ICON_OUTLINER_OB_EMPTY') + layout.itemO("object.armature_add", text="Armature", icon='ICON_OUTLINER_OB_ARMATURE') + layout.item_enumO("object.object_add", "type", 'LATTICE', icon='ICON_OUTLINER_OB_LATTICE') + layout.item_enumO("object.object_add", "type", 'EMPTY', icon='ICON_OUTLINER_OB_EMPTY') layout.itemS() - layout.item_enumO("OBJECT_OT_object_add", "type", 'CAMERA', icon='ICON_OUTLINER_OB_CAMERA') - layout.item_enumO("OBJECT_OT_object_add", "type", 'LAMP', icon='ICON_OUTLINER_OB_LAMP') + layout.item_enumO("object.object_add", "type", 'CAMERA', icon='ICON_OUTLINER_OB_CAMERA') + layout.item_enumO("object.object_add", "type", 'LAMP', icon='ICON_OUTLINER_OB_LAMP') class INFO_MT_game(bpy.types.Menu): __space_type__ = "INFO" -- 2.28.0