[Bf-blender-cvs] [3581b997d47] blender2.8: UI: use icons for the toolbar
Campbell Barton
noreply at git.blender.org
Tue Apr 24 10:33:12 CEST 2018
Commit: 3581b997d4793e8fd9ad7be7722b01edb2d75287
Author: Campbell Barton
Date: Tue Apr 24 09:19:28 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3581b997d4793e8fd9ad7be7722b01edb2d75287
UI: use icons for the toolbar
===================================================================
M release/datafiles/blender_icons_geom.py
A release/datafiles/icons/ops.generic.cursor.dat
A release/datafiles/icons/ops.generic.select_border.dat
A release/datafiles/icons/ops.generic.select_circle.dat
A release/datafiles/icons/ops.generic.select_lasso.dat
A release/datafiles/icons/ops.transform.resize.cage.dat
A release/datafiles/icons/ops.transform.resize.dat
A release/datafiles/icons/ops.transform.rotate.dat
A release/datafiles/icons/ops.transform.translate.dat
M release/scripts/startup/bl_ui/space_toolsystem_common.py
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M source/blender/editors/interface/interface_icons.c
M source/creator/CMakeLists.txt
===================================================================
diff --git a/release/datafiles/blender_icons_geom.py b/release/datafiles/blender_icons_geom.py
index b98f5a5a67d..3e2e5732074 100644
--- a/release/datafiles/blender_icons_geom.py
+++ b/release/datafiles/blender_icons_geom.py
@@ -123,7 +123,7 @@ def write_mesh_data_lists(me):
return (tris_coords, tris_colors)
-def write_mesh_to_py(fh, me):
+def write_mesh_to_py(fh, ob):
def float_as_byte(f):
# -1..1 -> 0..255
@@ -131,14 +131,24 @@ def write_mesh_to_py(fh, me):
f = int(round(f * 255))
return min(max(f, 0), 255)
- tris_coords, tris_colors = write_mesh_data_lists(me)
+ with TriMesh(ob) as me:
+ tris_coords, tris_colors = write_mesh_data_lists(me)
+
+ # pixel size needs to be increased since a pixel needs one extra geom coordinate
+ coords_range = (
+ ob.get("size_x") or 255,
+ ob.get("size_y") or 255,
+ )
+
+
+ print("Writing:", fh.name, coords_range)
fw = fh.write
# Header (version 0).
fw(b'VCO\x00')
# Width, Height
- fw(bytes((255, 255)))
+ fw(bytes(coords_range))
# X, Y
fw(bytes((0, 0)))
@@ -197,10 +207,8 @@ def main():
for name, ob in objects:
filename = os.path.join(args.output_dir, name + ".dat")
- print("Writing:", filename)
with open(filename, 'wb') as fh:
- with TriMesh(ob) as me:
- write_mesh_to_py(fh, me)
+ write_mesh_to_py(fh, ob)
if __name__ == "__main__":
diff --git a/release/datafiles/icons/ops.generic.cursor.dat b/release/datafiles/icons/ops.generic.cursor.dat
new file mode 100644
index 00000000000..cdb38ace509
Binary files /dev/null and b/release/datafiles/icons/ops.generic.cursor.dat differ
diff --git a/release/datafiles/icons/ops.generic.select_border.dat b/release/datafiles/icons/ops.generic.select_border.dat
new file mode 100644
index 00000000000..9a05dbc7c8d
Binary files /dev/null and b/release/datafiles/icons/ops.generic.select_border.dat differ
diff --git a/release/datafiles/icons/ops.generic.select_circle.dat b/release/datafiles/icons/ops.generic.select_circle.dat
new file mode 100644
index 00000000000..7df591d46d7
Binary files /dev/null and b/release/datafiles/icons/ops.generic.select_circle.dat differ
diff --git a/release/datafiles/icons/ops.generic.select_lasso.dat b/release/datafiles/icons/ops.generic.select_lasso.dat
new file mode 100644
index 00000000000..87426a60af4
Binary files /dev/null and b/release/datafiles/icons/ops.generic.select_lasso.dat differ
diff --git a/release/datafiles/icons/ops.transform.resize.cage.dat b/release/datafiles/icons/ops.transform.resize.cage.dat
new file mode 100644
index 00000000000..c0ad45eaf30
Binary files /dev/null and b/release/datafiles/icons/ops.transform.resize.cage.dat differ
diff --git a/release/datafiles/icons/ops.transform.resize.dat b/release/datafiles/icons/ops.transform.resize.dat
new file mode 100644
index 00000000000..bd1688705aa
Binary files /dev/null and b/release/datafiles/icons/ops.transform.resize.dat differ
diff --git a/release/datafiles/icons/ops.transform.rotate.dat b/release/datafiles/icons/ops.transform.rotate.dat
new file mode 100644
index 00000000000..79ebaa46cd2
Binary files /dev/null and b/release/datafiles/icons/ops.transform.rotate.dat differ
diff --git a/release/datafiles/icons/ops.transform.translate.dat b/release/datafiles/icons/ops.transform.translate.dat
new file mode 100644
index 00000000000..590fe6339a7
Binary files /dev/null and b/release/datafiles/icons/ops.transform.translate.dat differ
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_common.py b/release/scripts/startup/bl_ui/space_toolsystem_common.py
index aff9a8d6170..db35ab27506 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_common.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py
@@ -27,6 +27,9 @@ __all__ = (
)
+# (filename -> icon_value) map
+_icon_cache = {}
+
class ToolSelectPanelHelper:
"""
Generic Class, can be used for any toolbar.
@@ -51,6 +54,28 @@ class ToolSelectPanelHelper:
an optional triple of: ``(operator_id, operator_properties, keymap_item_args)``
"""
+ @staticmethod
+ def _icon_value_from_icon_handle(icon_name):
+ import os
+ if icon_name is not None:
+ assert(type(icon_name) is str)
+ icon_value = _icon_cache.get(icon_name)
+ if icon_value is None:
+ dirname = bpy.utils.resource_path('SYSTEM')
+ filename = os.path.join(dirname, "datafiles", "icons", icon_name + ".dat")
+ try:
+ icon_value = bpy.app.icons.new_triangles_from_file(filename)
+ except Exception as ex:
+ if os.path.exists(filename):
+ print("Missing icons:", filename, ex)
+ else:
+ print("Corrupt icon:", filename, ex)
+ icon_value = 0
+ _icon_cache[icon_name] = icon_value
+ return icon_value
+ else:
+ return 0
+
@staticmethod
def _tool_is_group(tool):
return type(tool[0]) is not str
@@ -68,9 +93,9 @@ class ToolSelectPanelHelper:
@classmethod
def _tool_vars_from_def(cls, item):
- text, mp_idname, actions = item
+ text, icon_name, mp_idname, actions = item
km, km_idname = (None, None) if actions is None else cls._tool_keymap[text]
- return (km_idname, mp_idname)
+ return (km_idname, mp_idname), icon_name
@staticmethod
def _tool_vars_from_active_with_index(context):
@@ -89,7 +114,7 @@ class ToolSelectPanelHelper:
)
@classmethod
- def _km_actionmouse_simple(cls, kc, text, actions):
+ def _km_actionmouse_simple(cls, kc, text, icon_name, actions):
# standalone
def props_assign_recursive(rna_props, py_props):
@@ -135,9 +160,9 @@ class ToolSelectPanelHelper:
return
for item in ToolSelectPanelHelper._tools_flatten(cls.tools_all()):
- text, mp_idname, actions = item
+ text, icon_name, mp_idname, actions = item
if actions is not None:
- km, km_idname = cls._km_actionmouse_simple(kc, text, actions)
+ km, km_idname = cls._km_actionmouse_simple(kc, text, icon_name, actions)
cls._tool_keymap[text] = km, km_idname
def draw(self, context):
@@ -151,12 +176,16 @@ class ToolSelectPanelHelper:
tool_def_active, index_active = self._tool_vars_from_active_with_index(context)
layout = self.layout
+ scale_y = 2.0
+
for tool_items in self.tools_from_context(context):
if tool_items:
col = layout.column(align=True)
+ col.scale_y = scale_y
for item in tool_items:
if item is None:
col = layout.column(align=True)
+ col.scale_y = scale_y
continue
if self._tool_is_group(item):
@@ -165,7 +194,7 @@ class ToolSelectPanelHelper:
for i, sub_item in enumerate(item):
if sub_item is None:
continue
- tool_def = self._tool_vars_from_def(sub_item)
+ tool_def, icon_name = self._tool_vars_from_def(sub_item)
is_active = (tool_def == tool_def_active)
if is_active:
index = i
@@ -184,21 +213,23 @@ class ToolSelectPanelHelper:
index = -1
use_menu = False
- tool_def = self._tool_vars_from_def(item)
+ tool_def, icon_name = self._tool_vars_from_def(item)
is_active = (tool_def == tool_def_active)
-
+ icon_value = ToolSelectPanelHelper._icon_value_from_icon_handle(icon_name)
if use_menu:
props = col.operator_menu_hold(
"wm.tool_set",
text=item[0],
depress=is_active,
menu="WM_MT_toolsystem_submenu",
+ icon_value=icon_value,
)
else:
props = col.operator(
"wm.tool_set",
text=item[0],
depress=is_active,
+ icon_value=icon_value,
)
props.keymap = tool_def[0] or ""
@@ -231,7 +262,7 @@ class WM_MT_toolsystem_submenu(Menu):
if (item_group is not None) and ToolSelectPanelHelper._tool_is_group(item_group):
if index_button < len(item_group):
item = item_group[index_button]
- tool_def = cls._tool_vars_from_def(item)
+ tool_def, icon_name = cls._tool_vars_from_def(item)
is_active = (tool_def == tool_def_button)
if is_active:
return cls, item_group, index_button
@@ -239,6 +270,8 @@ class WM_MT_toolsystem_submenu(Menu):
def draw(self, context):
layout = self.layout
+ layout.scale_y = 2.0
+
cls, item_group, index_active = self._tool_group_from_button(context)
if item_group is None:
# Should never happen, just in case
@@ -250,10 +283,12 @@ class WM_MT_toolsystem_submenu(Menu):
if item is None:
layout.separator()
continue
- tool_def = cls._tool_vars_from_def(item)
+ tool_def, icon_name = cls._tool_vars_from_def(item)
+ icon_value = ToolSelectPanelHelper._icon_value_from_icon_handle(icon_name)
props = layout.operator(
"wm.tool_set",
text=item[0],
+ icon_value=icon_value,
)
props.keymap = tool_def[0] or ""
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list