[gimp] app: take the handle transform tool out of the playground

[Michael Natterer <mitch src gnome org>]

commit 4b597f9622efb94df0fed91ec2a2e5c18494e68b
Author: Michael Natterer <mitch gimp org>
Date:   Mon Jun 19 22:56:07 2017 +0200

    app: take the handle transform tool out of the playground
    
    It seems proper enough now.

 app/config/gimpguiconfig.c          |   16 ----------------
 app/config/gimpguiconfig.h          |    1 -
 app/tools/gimphandletransformtool.c |   31 ++++++++++++-------------------
 menus/image-menu.xml.in             |    4 +---
 4 files changed, 13 insertions(+), 39 deletions(-)
---
diff --git a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c
index 5d995be..aa1f700 100644
--- a/app/config/gimpguiconfig.c
+++ b/app/config/gimpguiconfig.c
@@ -90,7 +90,6 @@ enum
   PROP_CURSOR_HANDEDNESS,
 
   PROP_PLAYGROUND_NPD_TOOL,
-  PROP_PLAYGROUND_HANDLE_TRANSFORM_TOOL,
   PROP_PLAYGROUND_SEAMLESS_CLONE_TOOL,
 
   PROP_HIDE_DOCKS,
@@ -423,15 +422,6 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass)
                             GIMP_CONFIG_PARAM_RESTART);
 
   GIMP_CONFIG_PROP_BOOLEAN (object_class,
-                            PROP_PLAYGROUND_HANDLE_TRANSFORM_TOOL,
-                            "playground-handle-transform-tool",
-                            "Playground Handle Transform tool",
-                            PLAYGROUND_HANDLE_TRANSFORM_TOOL_BLURB,
-                            FALSE,
-                            GIMP_PARAM_STATIC_STRINGS |
-                            GIMP_CONFIG_PARAM_RESTART);
-
-  GIMP_CONFIG_PROP_BOOLEAN (object_class,
                             PROP_PLAYGROUND_SEAMLESS_CLONE_TOOL,
                             "playground-seamless-clone-tool",
                             "Playground Seamless Clone tool",
@@ -706,9 +696,6 @@ gimp_gui_config_set_property (GObject      *object,
     case PROP_PLAYGROUND_NPD_TOOL:
       gui_config->playground_npd_tool = g_value_get_boolean (value);
       break;
-    case PROP_PLAYGROUND_HANDLE_TRANSFORM_TOOL:
-      gui_config->playground_handle_transform_tool = g_value_get_boolean (value);
-      break;
     case PROP_PLAYGROUND_SEAMLESS_CLONE_TOOL:
       gui_config->playground_seamless_clone_tool = g_value_get_boolean (value);
       break;
@@ -866,9 +853,6 @@ gimp_gui_config_get_property (GObject    *object,
     case PROP_PLAYGROUND_NPD_TOOL:
       g_value_set_boolean (value, gui_config->playground_npd_tool);
       break;
-    case PROP_PLAYGROUND_HANDLE_TRANSFORM_TOOL:
-      g_value_set_boolean (value, gui_config->playground_handle_transform_tool);
-      break;
     case PROP_PLAYGROUND_SEAMLESS_CLONE_TOOL:
       g_value_set_boolean (value, gui_config->playground_seamless_clone_tool);
       break;
diff --git a/app/config/gimpguiconfig.h b/app/config/gimpguiconfig.h
index 7fbe436..bbb8130 100644
--- a/app/config/gimpguiconfig.h
+++ b/app/config/gimpguiconfig.h
@@ -80,7 +80,6 @@ struct _GimpGuiConfig
 
   /* experimental playground */
   gboolean             playground_npd_tool;
-  gboolean             playground_handle_transform_tool;
   gboolean             playground_seamless_clone_tool;
 
   /* saved in sessionrc */
diff --git a/app/tools/gimphandletransformtool.c b/app/tools/gimphandletransformtool.c
index fe33cab..2a2cc4a 100644
--- a/app/tools/gimphandletransformtool.c
+++ b/app/tools/gimphandletransformtool.c
@@ -25,9 +25,6 @@
 
 #include "tools-types.h"
 
-#include "config/gimpguiconfig.h" /* playground */
-
-#include "core/gimp.h" /* playground */
 #include "core/gimp-transform-utils.h"
 
 #include "widgets/gimphelp-ids.h"
@@ -114,22 +111,18 @@ void
 gimp_handle_transform_tool_register (GimpToolRegisterCallback  callback,
                                      gpointer                  data)
 {
-  /* we should not know that "data" is a Gimp*, but what the heck this
-   * is experimental playground stuff
-   */
-  if (GIMP_GUI_CONFIG (GIMP (data)->config)->playground_handle_transform_tool)
-    (* callback) (GIMP_TYPE_HANDLE_TRANSFORM_TOOL,
-                  GIMP_TYPE_HANDLE_TRANSFORM_OPTIONS,
-                  gimp_handle_transform_options_gui,
-                  GIMP_CONTEXT_PROP_MASK_BACKGROUND,
-                  "gimp-handle-transform-tool",
-                  _("Handle Transform"),
-                  _("Handle Transform Tool: "
-                    "Deform the layer, selection or path with handles"),
-                  N_("_Handle Transform"), "<ctrl><shift>H",
-                  NULL, GIMP_HELP_TOOL_HANDLE_TRANSFORM,
-                  GIMP_ICON_TOOL_HANDLE_TRANSFORM,
-                  data);
+  (* callback) (GIMP_TYPE_HANDLE_TRANSFORM_TOOL,
+                GIMP_TYPE_HANDLE_TRANSFORM_OPTIONS,
+                gimp_handle_transform_options_gui,
+                GIMP_CONTEXT_PROP_MASK_BACKGROUND,
+                "gimp-handle-transform-tool",
+                _("Handle Transform"),
+                _("Handle Transform Tool: "
+                  "Deform the layer, selection or path with handles"),
+                N_("_Handle Transform"), "<ctrl><shift>H",
+                NULL, GIMP_HELP_TOOL_HANDLE_TRANSFORM,
+                GIMP_ICON_TOOL_HANDLE_TRANSFORM,
+                data);
 }
 
 static void
diff --git a/menus/image-menu.xml.in b/menus/image-menu.xml.in
index ca4ad03..342487a 100644
--- a/menus/image-menu.xml.in
+++ b/menus/image-menu.xml.in
@@ -653,9 +653,7 @@
         <menuitem action="tools-shear" />
         <menuitem action="tools-perspective" />
         <menuitem action="tools-unified-transform" />
-       <!-- Enable when the tool leaves the playground
-             <menuitem action="tools-handle-transform" />
-       -->
+        <menuitem action="tools-handle-transform" />
         <menuitem action="tools-flip" />
         <menuitem action="tools-cage" />
         <menuitem action="tools-warp" />