[Bf-blender-cvs] [6a7e974a936] userpref_redesign: Merge branch 'blender2.8' into userpref_redesign
Julian Eisel
noreply at git.blender.org
Thu Nov 22 19:07:31 CET 2018
Commit: 6a7e974a936c2cc363c519b0bf0d97d1f32e825c
Author: Julian Eisel
Date: Thu Nov 22 19:06:52 2018 +0100
Branches: userpref_redesign
https://developer.blender.org/rB6a7e974a936c2cc363c519b0bf0d97d1f32e825c
Merge branch 'blender2.8' into userpref_redesign
===================================================================
===================================================================
diff --cc release/scripts/addons
index c88411ff777,ad39a4b8961..6f0128c3322
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit c88411ff7776a2db5d6ef6117a1b2faa42a95611
-Subproject commit ad39a4b8961e2afb852852e2e3057bc3a770d2ee
++Subproject commit 6f0128c332290c6f3639d4d949d3e06bfaa71022
diff --cc release/scripts/addons_contrib
index 310578043de,ee92205e968..5c4210d5b78
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 310578043dec1aae382eb6a447ae1d103792d7e6
-Subproject commit ee92205e9687eabb0ef91d8c437014ac720126ea
++Subproject commit 5c4210d5b78c61137c5f32e7deb7561177ac0894
diff --cc release/scripts/startup/bl_ui/space_info.py
index 5424a7050c7,49c55410f53..b98c65e0f95
--- a/release/scripts/startup/bl_ui/space_info.py
+++ b/release/scripts/startup/bl_ui/space_info.py
@@@ -26,182 -26,15 +26,17 @@@ class INFO_HT_header(Header)
def draw(self, context):
layout = self.layout
+ layout.template_header()
- window = context.window
- workspace = context.workspace
- screen = context.screen
- scene = context.scene
- layer = context.view_layer
- view_render = workspace.view_render
+ # Empty for now until info editor gets turned into log editor
+ pass
+ row = layout.row(align=True)
+ row.template_header()
- INFO_MT_editor_menus.draw_collapsible(context, layout)
-
- layout.separator()
-
- if screen.show_fullscreen:
- layout.operator("screen.back_to_previous", icon='SCREEN_BACK', text="Back to Previous")
- layout.separator()
- else:
- layout.template_ID(window, "workspace", new="workspace.workspace_add_menu", unlink="workspace.workspace_delete")
- layout.template_search_preview(window, "screen", workspace, "screens", new="screen.new", unlink="screen.delete", rows=2, cols=6)
-
- act_mode_item = bpy.types.Object.bl_rna.properties["mode"].enum_items[layer.objects.active.mode]
- layout.operator_menu_enum("object.mode_set", "mode", text=act_mode_item.name, icon=act_mode_item.icon)
-
- row = layout.row()
- row.active = not workspace.use_scene_settings
- # Active workspace view-layer is retrieved through window, not through workspace.
- row.template_search(window, "view_layer", scene, "view_layers")
-
- if view_render.has_multiple_engines:
- row.prop(view_render, "engine", text="")
-
- layout.separator()
-
- layout.template_ID(window, "scene", new="scene.new", unlink="scene.delete")
-
- layout.separator()
-
- layout.template_running_jobs()
-
- layout.template_reports_banner()
-
- row = layout.row(align=True)
-
- if bpy.app.autoexec_fail is True and bpy.app.autoexec_fail_quiet is False:
- row.label("Auto-run disabled", icon='ERROR')
- if bpy.data.is_saved:
- props = row.operator("wm.revert_mainfile", icon='SCREEN_BACK', text="Reload Trusted")
- props.use_scripts = True
-
- row.operator("script.autoexec_warn_clear", text="Ignore")
-
- # include last so text doesn't push buttons out of the header
- row.label(bpy.app.autoexec_fail_message)
- return
-
- row.operator("wm.splash", text="", icon='BLENDER', emboss=False)
- row.label(text=scene.statistics(context.view_layer), translate=False)
-
-
- class INFO_MT_editor_menus(Menu):
- bl_idname = "INFO_MT_editor_menus"
- bl_label = ""
-
- def draw(self, context):
- self.draw_menus(self.layout, context)
-
- @staticmethod
- def draw_menus(layout, context):
- view_render = context.view_render
-
- layout.menu("INFO_MT_file")
-
- if view_render.use_game_engine:
- layout.menu("INFO_MT_game")
- else:
- layout.menu("INFO_MT_render")
-
- layout.menu("INFO_MT_window")
- layout.menu("INFO_MT_help")
-
-
- class INFO_MT_file(Menu):
- bl_label = "File"
-
- def draw(self, context):
- layout = self.layout
-
- layout.operator_context = 'INVOKE_AREA'
- layout.operator("wm.read_homefile", text="New", icon='NEW')
- layout.operator("wm.open_mainfile", text="Open...", icon='FILE_FOLDER')
- layout.menu("INFO_MT_file_open_recent", icon='OPEN_RECENT')
- layout.operator("wm.revert_mainfile", icon='FILE_REFRESH')
- layout.operator("wm.recover_last_session", icon='RECOVER_LAST')
- layout.operator("wm.recover_auto_save", text="Recover Auto Save...", icon='RECOVER_AUTO')
-
- layout.separator()
-
- layout.operator_context = 'EXEC_AREA' if context.blend_data.is_saved else 'INVOKE_AREA'
- layout.operator("wm.save_mainfile", text="Save", icon='FILE_TICK')
-
- layout.operator_context = 'INVOKE_AREA'
- layout.operator("wm.save_as_mainfile", text="Save As...", icon='SAVE_AS')
- layout.operator_context = 'INVOKE_AREA'
- layout.operator("wm.save_as_mainfile", text="Save Copy...", icon='SAVE_COPY').copy = True
-
- layout.separator()
-
- layout.operator("screen.settings_show", text="Settings...", icon='PREFERENCES')
-
- layout.operator_context = 'INVOKE_AREA'
- layout.operator("wm.save_homefile", icon='SAVE_PREFS')
- layout.operator("wm.read_factory_settings", icon='LOAD_FACTORY')
-
- if any(bpy.utils.app_template_paths()):
- app_template = context.user_preferences.app_template
- if app_template:
- layout.operator(
- "wm.read_factory_settings",
- text="Load Factory Template Settings",
- icon='LOAD_FACTORY',
- ).app_template = app_template
- del app_template
-
- layout.menu("USERPREF_MT_app_templates", icon='FILE_BLEND')
-
- layout.separator()
-
- layout.operator_context = 'INVOKE_AREA'
- layout.operator("wm.link", text="Link", icon='LINK_BLEND')
- layout.operator("wm.append", text="Append", icon='APPEND_BLEND')
- layout.menu("INFO_MT_file_previews")
-
- layout.separator()
-
- layout.menu("INFO_MT_file_import", icon='IMPORT')
- layout.menu("INFO_MT_file_export", icon='EXPORT')
-
- layout.separator()
-
- layout.menu("INFO_MT_file_external_data", icon='EXTERNAL_DATA')
- layout.operator("wm.blend_strings_utf8_validate", icon='FILE_BLEND')
-
- layout.separator()
-
- layout.operator_context = 'EXEC_AREA'
- if bpy.data.is_dirty and context.user_preferences.view.use_quit_dialog:
- layout.operator_context = 'INVOKE_SCREEN' # quit dialog
- layout.operator("wm.quit_blender", text="Quit", icon='QUIT')
-
-
- class INFO_MT_file_import(Menu):
- bl_idname = "INFO_MT_file_import"
- bl_label = "Import"
-
- def draw(self, context):
- if bpy.app.build_options.collada:
- self.layout.operator("wm.collada_import", text="Collada (Default) (.dae)")
- if bpy.app.build_options.alembic:
- self.layout.operator("wm.alembic_import", text="Alembic (.abc)")
-
-
- class INFO_MT_file_export(Menu):
- bl_idname = "INFO_MT_file_export"
- bl_label = "Export"
-
- def draw(self, context):
- if bpy.app.build_options.collada:
- self.layout.operator("wm.collada_export", text="Collada (Default) (.dae)")
- if bpy.app.build_options.alembic:
- self.layout.operator("wm.alembic_export", text="Alembic (.abc)")
-
-
- class INFO_MT_file_external_data(Menu):
- bl_label = "External Data"
+ # Not really info, just add to re-usable location.
+ class INFO_MT_area(Menu):
+ bl_label = "Area"
def draw(self, context):
layout = self.layout
diff --cc release/scripts/startup/bl_ui/space_topbar.py
index 00000000000,8b9c47839e9..b0b63fd7c7d
mode 000000,100644..100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@@ -1,0 -1,1049 +1,1049 @@@
+ # ##### 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+ # ##### END GPL LICENSE BLOCK #####
+
+ # <pep8 compliant>
+ import bpy
+ from bpy.types import Header, Menu, Panel
+ from .properties_grease_pencil_common import (
+ GPENCIL_UL_layer,
+ )
+
+
+ class TOPBAR_HT_upper_bar(Header):
+ bl_space_type = 'TOPBAR'
+
+ def draw(self, context):
+ region = context.region
+
+ if region.alignment == 'RIGHT':
+ self.draw_right(context)
+ else:
+ self.draw_left(context)
+
+ def draw_left(self, context):
+ layout = self.layout
+
+ window = context.window
+ screen = context.screen
+
+ layout.operator("wm.splash", text="", icon='BLENDER', emboss=False)
+
+ TOPBAR_MT_editor_menus.draw_collapsible(context, layout)
+
+ layout.separator()
+
+ if not screen.show_fullscreen:
+ layout.template_ID_tabs(
+ window, "workspace",
+ new="workspace.add",
+ menu="TOPBAR_MT_workspace_menu",
+ )
+ else:
+ layout.operator(
+ "screen.back_to_previous",
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list