Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-05-24 17:46:01 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-05-24 17:48:28 +0300
commit72f4bdf604c51b958f49a9bd6d0957b51af9a313 (patch)
treeea2a7cdda0582f918dfdd7146aa70e59bab82e9b /release
parentd638ad3b20577101cffedca069222b219e71b14f (diff)
UI: add top-level 'Edit' menu
Use this for undo/redo, copy/paste & preferences.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_sequencer.py4
-rw-r--r--release/scripts/startup/bl_ui/space_topbar.py27
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py19
3 files changed, 25 insertions, 25 deletions
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index cb7ed8b931f..c3b8c42dcd7 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -431,10 +431,6 @@ class SEQUENCER_MT_strip(Menu):
layout.operator_context = 'INVOKE_REGION_WIN'
- layout.operator("ed.undo")
- layout.operator("ed.redo")
- layout.operator("ed.undo_history")
-
layout.separator()
layout.menu("SEQUENCER_MT_strip_transform")
layout.operator("sequencer.snap")
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 386ed9d381d..637426a8a77 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -400,6 +400,7 @@ class INFO_MT_editor_menus(Menu):
@staticmethod
def draw_menus(layout, context):
layout.menu("INFO_MT_file")
+ layout.menu("INFO_MT_edit")
layout.menu("INFO_MT_window")
layout.menu("INFO_MT_help")
@@ -431,8 +432,6 @@ class INFO_MT_file(Menu):
layout.separator()
- layout.operator("screen.userpref_show", text="User Preferences...", icon='PREFERENCES')
-
layout.operator_context = 'INVOKE_AREA'
layout.operator("wm.save_homefile", icon='SAVE_PREFS')
layout.operator("wm.read_factory_settings", icon='LOAD_FACTORY')
@@ -560,6 +559,29 @@ class INFO_MT_opengl_render(Menu):
layout.prop_menu_enum(rd, "alpha_mode")
+class INFO_MT_edit(Menu):
+ bl_label = "Edit"
+
+ def draw(self, context):
+ layout = self.layout
+
+ layout.operator("ed.undo")
+ layout.operator("ed.redo")
+
+ layout.separator()
+
+ layout.operator("ed.undo_history")
+
+ layout.separator()
+
+ layout.operator("view3d.copybuffer", text="Copy Objects", icon='COPYDOWN')
+ layout.operator("view3d.pastebuffer", text="Paste Objects", icon='PASTEDOWN')
+
+ layout.separator()
+
+ layout.operator("screen.userpref_show", text="User Preferences...", icon='PREFERENCES')
+
+
class INFO_MT_window(Menu):
bl_label = "Window"
@@ -640,6 +662,7 @@ classes = (
INFO_MT_file_export,
INFO_MT_file_external_data,
INFO_MT_file_previews,
+ INFO_MT_edit,
INFO_MT_game,
INFO_MT_opengl_render,
INFO_MT_window,
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 2ebea02ed21..6dd344fe32c 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -1348,24 +1348,6 @@ class INFO_MT_add(Menu):
)
-# Currently unused
-'''
-class VIEW3D_MT_undo_redo(Menu):
- bl_label = "Undo/Redo"
- _operator_name = ""
-
- def draw(self, context):
- layout = self.layout
-
- layout.operator("ed.undo")
- layout.operator("ed.redo")
-
- layout.separator()
-
- layout.operator("ed.undo_history")
-'''
-
-
class VIEW3D_MT_object_relations(Menu):
bl_label = "Relations"
@@ -3914,7 +3896,6 @@ classes = (
INFO_MT_lightprobe_add,
INFO_MT_camera_add,
INFO_MT_add,
- # VIEW3D_MT_undo_redo,
VIEW3D_MT_object_relations,
VIEW3D_MT_object,
VIEW3D_MT_object_animation,