kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

UI: Top bar menu tweaks

Browse Source 
* Use icon for Blender menu
* Move Startup/Factory settings to Defaults submenu under File
* Move Preferences under Edit
* Move Quit to File
This commit is contained in:
Pablo Vazquez 2019-05-20 16:52:17 +02:00
parent 3f4dd54ff7
commit 828efef151
1 changed files with 54 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
release/scripts/startup/bl_ui/space_topbar.py
View File

@ -157,7 +157,7 @@ class TOPBAR_MT_editor_menus(Menu):
def draw(self, _context):
layout = self.layout
layout.menu("TOPBAR_MT_app")
layout.menu("TOPBAR_MT_app", text="", icon="BLENDER")
layout.menu("TOPBAR_MT_file")
layout.menu("TOPBAR_MT_edit")
@ -175,53 +175,19 @@ class TOPBAR_MT_app(Menu):
layout = self.layout
prefs = context.preferences
layout.operator("screen.userpref_show", text="Preferences...", icon='PREFERENCES')
layout.separator()
layout.operator_context = 'INVOKE_AREA'
if any(bpy.utils.app_template_paths()):
app_template = prefs.app_template
else:
app_template = None
if app_template:
layout.label(text=bpy.path.display_name(app_template, has_ext=False))
layout.operator("wm.save_homefile")
props = layout.operator("wm.read_factory_settings")
if app_template:
props.app_template = app_template
if prefs.use_preferences_save:
props = layout.operator(
"wm.read_factory_settings",
text="Load Factory Settings (Temporary)"
)
if app_template:
props.app_template = app_template
props.use_temporary_preferences = True
layout.separator()
layout.operator("preferences.app_template_install", text="Install Application Template...")
layout.separator()
layout.operator("wm.splash")
layout.separator()
layout.menu("TOPBAR_MT_app_about")
layout.menu("TOPBAR_MT_app_support")
layout.separator()
layout.operator_context = 'EXEC_AREA'
if bpy.data.is_dirty:
layout.operator_context = 'INVOKE_SCREEN' # quit dialog
layout.operator("wm.quit_blender", text="Quit", icon='QUIT')
layout.menu("TOPBAR_MT_app_about")
layout.separator()
layout.operator("preferences.app_template_install", text="Install Application Template...")
class TOPBAR_MT_file(Menu):
@ -263,6 +229,17 @@ class TOPBAR_MT_file(Menu):
layout.menu("TOPBAR_MT_file_external_data")
layout.separator()
layout.menu("TOPBAR_MT_file_defaults")
layout.separator()
layout.operator_context = 'EXEC_AREA'
if bpy.data.is_dirty:
layout.operator_context = 'INVOKE_SCREEN' # quit dialog
layout.operator("wm.quit_blender", text="Quit", icon='QUIT')
class TOPBAR_MT_file_new(Menu):
bl_label = "New File"
@ -339,6 +316,38 @@ class TOPBAR_MT_file_recover(Menu):
layout.operator("wm.recover_auto_save", text="Auto Save...")
class TOPBAR_MT_file_defaults(Menu):
bl_label = "Defaults"
def draw(self, context):
layout = self.layout
prefs = context.preferences
layout.operator_context = 'INVOKE_AREA'
if any(bpy.utils.app_template_paths()):
app_template = prefs.app_template
else:
app_template = None
if app_template:
layout.label(text=bpy.path.display_name(app_template, has_ext=False))
layout.operator("wm.save_homefile")
props = layout.operator("wm.read_factory_settings")
if app_template:
props.app_template = app_template
if prefs.use_preferences_save:
props = layout.operator(
"wm.read_factory_settings",
text="Load Factory Settings (Temporary)"
)
if app_template:
props.app_template = app_template
props.use_temporary_preferences = True
class TOPBAR_MT_app_about(Menu):
bl_label = "About"
@ -520,6 +529,10 @@ class TOPBAR_MT_edit(Menu):
tool_settings = context.tool_settings
layout.prop(tool_settings, "lock_object_mode")
layout.separator()
layout.operator("screen.userpref_show", text="Preferences...", icon='PREFERENCES')
class TOPBAR_MT_window(Menu):
bl_label = "Window"
@ -773,6 +786,7 @@ classes = (
TOPBAR_MT_file,
TOPBAR_MT_file_new,
TOPBAR_MT_file_recover,
TOPBAR_MT_file_defaults,
TOPBAR_MT_templates_more,
TOPBAR_MT_file_import,
TOPBAR_MT_file_export,