2011-03-21 12:35:49 +00:00
|
|
|
# ##### 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>
|
|
|
|
|
|
|
|
# note, properties_animviz is a helper module only.
|
|
|
|
|
2016-03-03 19:14:02 +00:00
|
|
|
# support reloading sub-modules
|
2011-03-21 12:35:49 +00:00
|
|
|
if "bpy" in locals():
|
2015-01-23 01:37:58 +00:00
|
|
|
from importlib import reload
|
2017-03-29 01:35:00 +00:00
|
|
|
_modules_loaded[:] = [reload(val) for val in _modules_loaded]
|
2015-01-23 01:37:58 +00:00
|
|
|
del reload
|
2016-03-02 19:31:11 +00:00
|
|
|
|
2013-03-21 23:25:18 +00:00
|
|
|
_modules = [
|
2011-03-21 12:35:49 +00:00
|
|
|
"properties_animviz",
|
2013-03-11 01:59:48 +00:00
|
|
|
"properties_constraint",
|
2011-03-21 12:35:49 +00:00
|
|
|
"properties_data_armature",
|
|
|
|
"properties_data_bone",
|
|
|
|
"properties_data_camera",
|
|
|
|
"properties_data_curve",
|
|
|
|
"properties_data_empty",
|
|
|
|
"properties_data_lamp",
|
|
|
|
"properties_data_lattice",
|
|
|
|
"properties_data_mesh",
|
|
|
|
"properties_data_metaball",
|
|
|
|
"properties_data_modifier",
|
2017-06-12 10:59:54 +00:00
|
|
|
"properties_data_lightprobe",
|
2011-08-01 11:44:20 +00:00
|
|
|
"properties_data_speaker",
|
2017-10-16 19:15:03 +00:00
|
|
|
"properties_data_workspace",
|
2012-07-25 13:09:12 +00:00
|
|
|
"properties_mask_common",
|
2011-03-21 12:35:49 +00:00
|
|
|
"properties_material",
|
|
|
|
"properties_object",
|
2013-08-30 11:46:19 +00:00
|
|
|
"properties_paint_common",
|
2014-02-13 17:49:26 +00:00
|
|
|
"properties_grease_pencil_common",
|
2016-12-28 16:30:58 +00:00
|
|
|
"properties_particle",
|
2011-03-21 12:35:49 +00:00
|
|
|
"properties_physics_cloth",
|
|
|
|
"properties_physics_common",
|
2011-05-24 07:08:58 +00:00
|
|
|
"properties_physics_dynamicpaint",
|
2011-03-21 12:35:49 +00:00
|
|
|
"properties_physics_field",
|
|
|
|
"properties_physics_fluid",
|
2013-01-23 05:56:44 +00:00
|
|
|
"properties_physics_rigidbody",
|
2013-01-23 05:56:56 +00:00
|
|
|
"properties_physics_rigidbody_constraint",
|
2011-03-21 12:35:49 +00:00
|
|
|
"properties_physics_smoke",
|
|
|
|
"properties_physics_softbody",
|
|
|
|
"properties_render",
|
2017-11-22 12:52:39 +00:00
|
|
|
"properties_view_layer",
|
2011-03-21 12:35:49 +00:00
|
|
|
"properties_scene",
|
|
|
|
"properties_texture",
|
|
|
|
"properties_world",
|
2017-10-21 05:19:48 +00:00
|
|
|
|
|
|
|
# Generic Space Modules
|
|
|
|
#
|
|
|
|
# Depends on DNA_WORKSPACE_TOOL (C define).
|
2017-11-02 12:05:13 +00:00
|
|
|
"space_toolsystem_common",
|
2017-10-21 05:19:48 +00:00
|
|
|
"space_toolsystem_toolbar",
|
|
|
|
|
2011-11-07 12:55:18 +00:00
|
|
|
"space_clip",
|
2011-03-21 12:35:49 +00:00
|
|
|
"space_console",
|
|
|
|
"space_dopesheet",
|
|
|
|
"space_filebrowser",
|
|
|
|
"space_graph",
|
|
|
|
"space_image",
|
|
|
|
"space_info",
|
|
|
|
"space_nla",
|
|
|
|
"space_node",
|
|
|
|
"space_outliner",
|
2013-06-19 19:37:17 +00:00
|
|
|
"space_properties",
|
2011-03-21 12:35:49 +00:00
|
|
|
"space_sequencer",
|
2018-05-23 20:38:25 +00:00
|
|
|
"space_statusbar",
|
2011-03-21 12:35:49 +00:00
|
|
|
"space_text",
|
|
|
|
"space_time",
|
UI: New Global Top-Bar (WIP)
== Main Features/Changes for Users
* Add horizontal bar at top of all non-temp windows, consisting out of two horizontal sub-bars.
* Upper sub-bar contains global menus (File, Render, etc.), tabs for workspaces and scene selector.
* Lower sub-bar contains object mode selector, screen-layout and render-layer selector. Later operator and/or tool settings will be placed here.
* Individual sections of the topbar are individually scrollable.
* Workspace tabs can be double- or ctrl-clicked for renaming and contain 'x' icon for deleting.
* Top-bar should scale nicely with DPI.
* The lower half of the top-bar can be hided by dragging the lower top-bar edge up. Better hiding options are planned (e.g. hide in fullscreen modes).
* Info editors at the top of the window and using the full window width with be replaced by the top-bar.
* In fullscreen modes, no more info editor is added on top, the top-bar replaces it.
== Technical Features/Changes
* Adds initial support for global areas
A global area is part of the window, not part of the regular screen-layout.
I've added a macro iterator to iterate over both, global and screen-layout level areas. When iterating over areas, from now on developers should always consider if they have to include global areas.
* Adds a TOPBAR editor type
The editor type is hidden in the UI editor type menu.
* Adds a variation of the ID template to display IDs as tab buttons (template_ID_tabs in BPY)
* Does various changes to RNA button creation code to improve their appearance in the horizontal top-bar.
* Adds support for dynamically sized regions. That is, regions that scale automatically to the layout bounds.
The code for this is currently a big hack (it's based on drawing the UI multiple times). This should definitely be improved.
* Adds a template for displaying operator properties optimized for the top-bar. This will probably change a lot still and is in fact disabled in code.
Since the final top-bar design depends a lot on other 2.8 designs (mainly tool-system and workspaces), we decided to not show the operator or tool settings in the top-bar for now. That means most of the lower sub-bar is empty for the time being.
NOTE: Top-bar or global area data is not written to files or SDNA. They are simply added to the window when opening Blender or reading a file. This allows us doing changes to the top-bar without having to care for compatibility.
== ToDo's
It's a bit hard to predict all the ToDo's here are the known main ones:
* Add options for the new active-tool system and for operator redo to the topbar.
* Automatically hide the top-bar in fullscreen modes.
* General visual polish.
* Top-bar drag & drop support (WIP in temp-tab_drag_drop).
* Improve dynamic regions (should also fix some layout glitches).
* Make internal terminology consistent.
* Enable topbar file writing once design is more advanced.
* Address TODO's and XXX's in code :)
Thanks @brecht for the review! And @sergey for the complaining ;)
Differential Revision: D2758
2018-04-20 15:14:03 +00:00
|
|
|
"space_topbar",
|
2011-03-21 12:35:49 +00:00
|
|
|
"space_userpref",
|
|
|
|
"space_view3d",
|
|
|
|
"space_view3d_toolbar",
|
2018-06-05 14:32:11 +00:00
|
|
|
]
|
2013-03-21 23:25:18 +00:00
|
|
|
|
|
|
|
import bpy
|
|
|
|
|
|
|
|
if bpy.app.build_options.freestyle:
|
|
|
|
_modules.append("properties_freestyle")
|
2016-03-02 19:31:11 +00:00
|
|
|
|
2011-03-21 12:35:49 +00:00
|
|
|
__import__(name=__name__, fromlist=_modules)
|
|
|
|
_namespace = globals()
|
2016-03-02 19:31:11 +00:00
|
|
|
_modules_loaded = [_namespace[name] for name in _modules]
|
2011-03-21 12:35:49 +00:00
|
|
|
del _namespace
|
|
|
|
|
|
|
|
|
|
|
|
def register():
|
2017-03-18 09:03:24 +00:00
|
|
|
from bpy.utils import register_class
|
|
|
|
for mod in _modules_loaded:
|
|
|
|
for cls in mod.classes:
|
|
|
|
register_class(cls)
|
2011-03-21 12:35:49 +00:00
|
|
|
|
|
|
|
# space_userprefs.py
|
2018-02-01 02:58:44 +00:00
|
|
|
from bpy.props import (
|
|
|
|
EnumProperty,
|
|
|
|
StringProperty,
|
|
|
|
)
|
2012-01-18 06:11:56 +00:00
|
|
|
from bpy.types import WindowManager
|
2011-03-21 12:35:49 +00:00
|
|
|
|
2011-05-26 18:11:59 +00:00
|
|
|
def addon_filter_items(self, context):
|
|
|
|
import addon_utils
|
|
|
|
|
2018-02-01 02:58:44 +00:00
|
|
|
items = [
|
|
|
|
('All', "All", "All Add-ons"),
|
|
|
|
('User', "User", "All Add-ons Installed by User"),
|
|
|
|
('Enabled', "Enabled", "All Enabled Add-ons"),
|
|
|
|
('Disabled', "Disabled", "All Disabled Add-ons"),
|
|
|
|
]
|
2011-05-26 18:11:59 +00:00
|
|
|
|
|
|
|
items_unique = set()
|
|
|
|
|
2013-08-28 06:36:54 +00:00
|
|
|
for mod in addon_utils.modules(refresh=False):
|
2011-05-26 18:11:59 +00:00
|
|
|
info = addon_utils.module_bl_info(mod)
|
|
|
|
items_unique.add(info["category"])
|
|
|
|
|
|
|
|
items.extend([(cat, cat, "") for cat in sorted(items_unique)])
|
|
|
|
return items
|
|
|
|
|
2011-08-19 19:25:20 +00:00
|
|
|
WindowManager.addon_search = StringProperty(
|
2018-02-01 02:58:44 +00:00
|
|
|
name="Search",
|
|
|
|
description="Search within the selected filter",
|
|
|
|
options={'TEXTEDIT_UPDATE'},
|
|
|
|
)
|
2011-03-21 12:35:49 +00:00
|
|
|
WindowManager.addon_filter = EnumProperty(
|
2018-02-01 02:58:44 +00:00
|
|
|
items=addon_filter_items,
|
|
|
|
name="Category",
|
|
|
|
description="Filter add-ons by category",
|
|
|
|
)
|
2011-03-21 12:35:49 +00:00
|
|
|
|
|
|
|
WindowManager.addon_support = EnumProperty(
|
2018-02-01 02:58:44 +00:00
|
|
|
items=[
|
|
|
|
('OFFICIAL', "Official", "Officially supported"),
|
|
|
|
('COMMUNITY', "Community", "Maintained by community developers"),
|
|
|
|
('TESTING', "Testing", "Newly contributed scripts (excluded from release builds)")
|
|
|
|
],
|
|
|
|
name="Support",
|
|
|
|
description="Display support level",
|
|
|
|
default={'OFFICIAL', 'COMMUNITY'},
|
|
|
|
options={'ENUM_FLAG'},
|
|
|
|
)
|
2011-03-21 12:35:49 +00:00
|
|
|
# done...
|
|
|
|
|
|
|
|
|
|
|
|
def unregister():
|
2017-03-18 09:03:24 +00:00
|
|
|
from bpy.utils import unregister_class
|
|
|
|
for mod in reversed(_modules_loaded):
|
|
|
|
for cls in reversed(mod.classes):
|
2017-03-29 01:35:00 +00:00
|
|
|
if cls.is_registered:
|
|
|
|
unregister_class(cls)
|
2013-01-15 23:15:32 +00:00
|
|
|
|
This commit frees list ui items from their dependencies to Panel, and hence from all the limitations this implied (mostly, the "only one list per panel" one).
It introduces a new (py-extendable and registrable) RNA type, UIList (roughly similar to Panel one), which currently contains only "standard" list's scroll pos and size (but may be expended to include e.g. some filtering data, etc.). This now makes lists completely independent from Panels!
This UIList has a draw_item callback which allows to customize items' drawing from python, that all addons can now use. Incidentally, this also greatly simplifies the C code of this widget, as we do not code any "special case" here anymore!
To make all this work, other changes were also necessary:
* Now all buttons (uiBut struct) have a 'custom_data' void pointer, used currently to store the uiList struct associated with a given uiLayoutListBox.
* DynamicPaintSurface now exposes a new bool, use_color_preview (readonly), saying whether that surface has some 3D view preview data or not.
* UILayout class has now four new (static) functions, to get the actual icon of any RNA object (important e.g. with materials or textures), and to get an enum item's UI name, description and icon.
* UILayout's label() func now takes an optional 'icon_value' integer parameter, which if not zero will override the 'icon' one (mandatory to use "custom" icons as generated for material/texture/... previews).
Note: not sure whether we should add that one to all UILayout's prop funcs?
Note: will update addons using template list asap.
2012-12-28 09:20:16 +00:00
|
|
|
# Define a default UIList, when a list does not need any custom drawing...
|
2013-02-18 14:03:26 +00:00
|
|
|
# Keep in sync with its #defined name in UI_interface.h
|
2018-06-05 14:32:11 +00:00
|
|
|
|
|
|
|
|
This commit frees list ui items from their dependencies to Panel, and hence from all the limitations this implied (mostly, the "only one list per panel" one).
It introduces a new (py-extendable and registrable) RNA type, UIList (roughly similar to Panel one), which currently contains only "standard" list's scroll pos and size (but may be expended to include e.g. some filtering data, etc.). This now makes lists completely independent from Panels!
This UIList has a draw_item callback which allows to customize items' drawing from python, that all addons can now use. Incidentally, this also greatly simplifies the C code of this widget, as we do not code any "special case" here anymore!
To make all this work, other changes were also necessary:
* Now all buttons (uiBut struct) have a 'custom_data' void pointer, used currently to store the uiList struct associated with a given uiLayoutListBox.
* DynamicPaintSurface now exposes a new bool, use_color_preview (readonly), saying whether that surface has some 3D view preview data or not.
* UILayout class has now four new (static) functions, to get the actual icon of any RNA object (important e.g. with materials or textures), and to get an enum item's UI name, description and icon.
* UILayout's label() func now takes an optional 'icon_value' integer parameter, which if not zero will override the 'icon' one (mandatory to use "custom" icons as generated for material/texture/... previews).
Note: not sure whether we should add that one to all UILayout's prop funcs?
Note: will update addons using template list asap.
2012-12-28 09:20:16 +00:00
|
|
|
class UI_UL_list(bpy.types.UIList):
|
2013-08-29 12:55:31 +00:00
|
|
|
# These are common filtering or ordering operations (same as the default C ones!).
|
|
|
|
@staticmethod
|
|
|
|
def filter_items_by_name(pattern, bitflag, items, propname="name", flags=None, reverse=False):
|
|
|
|
"""
|
|
|
|
Set FILTER_ITEM for items which name matches filter_name one (case-insensitive).
|
|
|
|
pattern is the filtering pattern.
|
|
|
|
propname is the name of the string property to use for filtering.
|
|
|
|
flags must be a list of integers the same length as items, or None!
|
|
|
|
return a list of flags (based on given flags if not None),
|
2013-09-18 05:20:43 +00:00
|
|
|
or an empty list if no flags were given and no filtering has been done.
|
2013-08-29 12:55:31 +00:00
|
|
|
"""
|
|
|
|
import fnmatch
|
|
|
|
|
2013-08-29 14:37:46 +00:00
|
|
|
if not pattern or not items: # Empty pattern or list = no filtering!
|
2013-08-29 12:55:31 +00:00
|
|
|
return flags or []
|
|
|
|
|
|
|
|
if flags is None:
|
|
|
|
flags = [0] * len(items)
|
2013-08-29 14:37:46 +00:00
|
|
|
|
|
|
|
# Implicitly add heading/trailing wildcards.
|
|
|
|
pattern = "*" + pattern + "*"
|
|
|
|
|
|
|
|
for i, item in enumerate(items):
|
|
|
|
name = getattr(item, propname, None)
|
2013-08-29 12:55:31 +00:00
|
|
|
# This is similar to a logical xor
|
2013-08-29 14:37:46 +00:00
|
|
|
if bool(name and fnmatch.fnmatchcase(name, pattern)) is not bool(reverse):
|
|
|
|
flags[i] |= bitflag
|
2013-08-29 12:55:31 +00:00
|
|
|
return flags
|
|
|
|
|
|
|
|
@staticmethod
|
|
|
|
def sort_items_helper(sort_data, key, reverse=False):
|
|
|
|
"""
|
|
|
|
Common sorting utility. Returns a neworder list mapping org_idx -> new_idx.
|
|
|
|
sort_data must be an (unordered) list of tuples [(org_idx, ...), (org_idx, ...), ...].
|
|
|
|
key must be the same kind of callable you would use for sorted() builtin function.
|
|
|
|
reverse will reverse the sorting!
|
|
|
|
"""
|
|
|
|
sort_data.sort(key=key, reverse=reverse)
|
|
|
|
neworder = [None] * len(sort_data)
|
|
|
|
for newidx, (orgidx, *_) in enumerate(sort_data):
|
|
|
|
neworder[orgidx] = newidx
|
|
|
|
return neworder
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def sort_items_by_name(cls, items, propname="name"):
|
|
|
|
"""
|
|
|
|
Re-order items using their names (case-insensitive).
|
|
|
|
propname is the name of the string property to use for sorting.
|
|
|
|
return a list mapping org_idx -> new_idx,
|
|
|
|
or an empty list if no sorting has been done.
|
|
|
|
"""
|
|
|
|
_sort = [(idx, getattr(it, propname, "")) for idx, it in enumerate(items)]
|
|
|
|
return cls.sort_items_helper(_sort, lambda e: e[1].lower())
|
|
|
|
|
This commit frees list ui items from their dependencies to Panel, and hence from all the limitations this implied (mostly, the "only one list per panel" one).
It introduces a new (py-extendable and registrable) RNA type, UIList (roughly similar to Panel one), which currently contains only "standard" list's scroll pos and size (but may be expended to include e.g. some filtering data, etc.). This now makes lists completely independent from Panels!
This UIList has a draw_item callback which allows to customize items' drawing from python, that all addons can now use. Incidentally, this also greatly simplifies the C code of this widget, as we do not code any "special case" here anymore!
To make all this work, other changes were also necessary:
* Now all buttons (uiBut struct) have a 'custom_data' void pointer, used currently to store the uiList struct associated with a given uiLayoutListBox.
* DynamicPaintSurface now exposes a new bool, use_color_preview (readonly), saying whether that surface has some 3D view preview data or not.
* UILayout class has now four new (static) functions, to get the actual icon of any RNA object (important e.g. with materials or textures), and to get an enum item's UI name, description and icon.
* UILayout's label() func now takes an optional 'icon_value' integer parameter, which if not zero will override the 'icon' one (mandatory to use "custom" icons as generated for material/texture/... previews).
Note: not sure whether we should add that one to all UILayout's prop funcs?
Note: will update addons using template list asap.
2012-12-28 09:20:16 +00:00
|
|
|
|
|
|
|
bpy.utils.register_class(UI_UL_list)
|