[Bf-blender-cvs] [0e91daac6d3] greasepencil-object: GPencil: Set all tools in one Toolbar Icon

[Antonio Vazquez]

Commit: 0e91daac6d38589706f8f0faaa2d345133cb4b0d
Author: Antonio Vazquez
Date:   Tue Oct 1 20:14:49 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rB0e91daac6d38589706f8f0faaa2d345133cb4b0d

GPencil: Set all tools in one Toolbar Icon

===================================================================

M	release/scripts/presets/keyconfig/keymap_data/blender_default.py
M	release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M	source/blender/editors/gpencil/gpencil_uv.c

===================================================================

diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 0c726dca66d..765ca6b052f 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -5959,35 +5959,13 @@ def km_3d_view_tool_edit_gpencil_to_sphere(params):
     )
 
 
-def km_3d_view_tool_edit_gpencil_translate_uv(params):
+def km_3d_view_tool_edit_gpencil_transform_uv(params):
     return (
-        "3D View Tool: Edit Gpencil, Translate UV",
+        "3D View Tool: Edit Gpencil, Transform UV",
         {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
         {"items": [
             ("gpencil.transform_uv", {"type": params.tool_tweak, "value": 'ANY'},
-             {"properties": [("mode", 'TRANSLATE'), ("release_confirm", True)]}),
-        ]},
-    )
-
-
-def km_3d_view_tool_edit_gpencil_rotate_uv(params):
-    return (
-        "3D View Tool: Edit Gpencil, Rotate UV",
-        {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
-        {"items": [
-            ("gpencil.transform_uv", {"type": params.tool_tweak, "value": 'ANY'},
-             {"properties": [("mode", 'ROTATE'), ("release_confirm", True)]}),
-        ]},
-    )
-
-
-def km_3d_view_tool_edit_gpencil_scale_uv(params):
-    return (
-        "3D View Tool: Edit Gpencil, Scale UV",
-        {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
-        {"items": [
-            ("gpencil.transform_uv", {"type": params.tool_tweak, "value": 'ANY'},
-             {"properties": [("mode", 'SCALE'), ("release_confirm", True)]}),
+             {"properties": [("release_confirm", True)]}),
         ]},
     )
 
@@ -6249,9 +6227,7 @@ def generate_keymaps(params=None):
         km_3d_view_tool_edit_gpencil_bend(params),
         km_3d_view_tool_edit_gpencil_shear(params),
         km_3d_view_tool_edit_gpencil_to_sphere(params),
-        km_3d_view_tool_edit_gpencil_translate_uv(params),
-        km_3d_view_tool_edit_gpencil_rotate_uv(params),
-        km_3d_view_tool_edit_gpencil_scale_uv(params),
+        km_3d_view_tool_edit_gpencil_transform_uv(params),
         km_3d_view_tool_sculpt_gpencil_paint(params),
         km_3d_view_tool_sculpt_gpencil_select(params),
         km_3d_view_tool_sculpt_gpencil_select_box(params),
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 2ac2e256f74..ac69f7b4deb 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -1523,36 +1523,21 @@ class _defs_gpencil_edit:
         )
 
     @ToolDef.from_fn
-    def transform_uv_translate():
-        return dict(
-            idname="builtin.translate_uv",
-            label="Translate UV",
-            icon="ops.gpencil.translate_uv",
-            cursor='DEFAULT',
-            widget=None,
-            keymap=(),
-        )
-
-    @ToolDef.from_fn
-    def transform_uv_rotate():
-        return dict(
-            idname="builtin.rotate_uv",
-            label="Rotate UV",
-            icon="ops.gpencil.rotate_uv",
-            cursor='DEFAULT',
-            widget=None,
-            keymap=(),
-        )
+    def transform_uv():
+        def draw_settings(context, layout, tool):
+                props = tool.operator_properties("gpencil.transform_uv")
+                row = layout.row()
+                row.use_property_split = False
+                row.prop(props, "mode", expand=True)
 
-    @ToolDef.from_fn
-    def transform_uv_scale():
         return dict(
-            idname="builtin.scale_uv",
-            label="Scale UV",
-            icon="ops.gpencil.scale_uv",
+            idname="builtin.transform_uv",
+            label="Transform UV",
+            icon="ops.gpencil.transform_uv",
             cursor='DEFAULT',
             widget=None,
             keymap=(),
+            draw_settings=draw_settings,
         )
 
 class _defs_gpencil_sculpt:
@@ -2096,9 +2081,7 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
                 _defs_gpencil_edit.tosphere,
             ),
             None,
-            _defs_gpencil_edit.transform_uv_translate,
-            _defs_gpencil_edit.transform_uv_rotate,
-            _defs_gpencil_edit.transform_uv_scale,
+            _defs_gpencil_edit.transform_uv,
         ],
         'SCULPT_GPENCIL': [
             _defs_gpencil_sculpt.generate_from_brushes,
diff --git a/source/blender/editors/gpencil/gpencil_uv.c b/source/blender/editors/gpencil/gpencil_uv.c
index adbb63622a9..deedcc2a4c6 100644
--- a/source/blender/editors/gpencil/gpencil_uv.c
+++ b/source/blender/editors/gpencil/gpencil_uv.c
@@ -481,8 +481,8 @@ static int gpencil_uv_transform_modal(bContext *C, wmOperator *op, const wmEvent
 void GPENCIL_OT_transform_uv(wmOperatorType *ot)
 {
   static const EnumPropertyItem uv_mode[] = {
-      {GP_UV_ROTATE, "ROTATE", 0, "Rotate", ""},
       {GP_UV_TRANSLATE, "TRANSLATE", 0, "Translate", ""},
+      {GP_UV_ROTATE, "ROTATE", 0, "Rotate", ""},
       {GP_UV_SCALE, "SCALE", 0, "Scale", ""},
       {0, NULL, 0, NULL, NULL},
   };
@@ -506,7 +506,6 @@ void GPENCIL_OT_transform_uv(wmOperatorType *ot)
 
   /* properties */
   ot->prop = RNA_def_enum(ot->srna, "mode", uv_mode, 0, "Mode", "");
-  RNA_def_property_flag(ot->prop, PROP_HIDDEN | PROP_SKIP_SAVE);
 
   RNA_def_float_vector(
       ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX, "Location", "", -FLT_MAX, FLT_MAX);