[gimp/wip/Jehan/issue-498-quick-brush-edit: 23/26] app: remove GIMP_MODIFIER_ACTION_BRUSH_SIZE, change defaults and labels.

[Jehan <jehanp src gnome org>]

commit 14e8703ff7b94df7149e748053a4afb17c3b2679
Author: Jehan <jehan girinstud io>
Date:   Fri Aug 12 01:41:07 2022 +0200

    app: remove GIMP_MODIFIER_ACTION_BRUSH_SIZE, change defaults and labels.
    
    * The relative brush size change was not implemented anyway. Maybe later.
    * Also changing the defaults to GIMP_MODIFIER_ACTION_BRUSH_PIXEL_SIZE
      which I think might be the most understandable size variant.
    * Finally re-label "Rotate" to "Rotate View" as per Aryeom's feedback
      because just "Rotate" is indeed confusing as it could mean several
      different actions in GIMP.

 app/display/display-enums.c                | 6 ++----
 app/display/display-enums.h                | 5 ++---
 app/display/gimpdisplayshell-tool-events.c | 7 +------
 app/display/gimpmodifiersmanager.c         | 4 ++--
 4 files changed, 7 insertions(+), 15 deletions(-)
---
diff --git a/app/display/display-enums.c b/app/display/display-enums.c
index 84e719d993..c9be1369dc 100644
--- a/app/display/display-enums.c
+++ b/app/display/display-enums.c
@@ -606,7 +606,6 @@ gimp_modifier_action_get_type (void)
     { GIMP_MODIFIER_ACTION_MENU, "GIMP_MODIFIER_ACTION_MENU", "menu" },
     { GIMP_MODIFIER_ACTION_BRUSH_PIXEL_SIZE, "GIMP_MODIFIER_ACTION_BRUSH_PIXEL_SIZE", "brush-pixel-size" },
     { GIMP_MODIFIER_ACTION_BRUSH_RADIUS_PIXEL_SIZE, "GIMP_MODIFIER_ACTION_BRUSH_RADIUS_PIXEL_SIZE", 
"brush-radius-pixel-size" },
-    { GIMP_MODIFIER_ACTION_BRUSH_SIZE, "GIMP_MODIFIER_ACTION_BRUSH_SIZE", "brush-size" },
     { 0, NULL, NULL }
   };
 
@@ -615,13 +614,12 @@ gimp_modifier_action_get_type (void)
     { GIMP_MODIFIER_ACTION_NONE, NC_("modifier-action", "No action"), NULL },
     { GIMP_MODIFIER_ACTION_PANNING, NC_("modifier-action", "Pan"), NULL },
     { GIMP_MODIFIER_ACTION_ZOOMING, NC_("modifier-action", "Zoom"), NULL },
-    { GIMP_MODIFIER_ACTION_ROTATING, NC_("modifier-action", "Rotate"), NULL },
-    { GIMP_MODIFIER_ACTION_STEP_ROTATING, NC_("modifier-action", "Rotate by 15 degree steps"), NULL },
+    { GIMP_MODIFIER_ACTION_ROTATING, NC_("modifier-action", "Rotate View"), NULL },
+    { GIMP_MODIFIER_ACTION_STEP_ROTATING, NC_("modifier-action", "Rotate View by 15 degree steps"), NULL },
     { GIMP_MODIFIER_ACTION_LAYER_PICKING, NC_("modifier-action", "Pick a layer"), NULL },
     { GIMP_MODIFIER_ACTION_MENU, NC_("modifier-action", "Display the menu"), NULL },
     { GIMP_MODIFIER_ACTION_BRUSH_PIXEL_SIZE, NC_("modifier-action", "Change brush size in canvas pixels"), 
NULL },
     { GIMP_MODIFIER_ACTION_BRUSH_RADIUS_PIXEL_SIZE, NC_("modifier-action", "Change brush radius' size in 
canvas pixels"), NULL },
-    { GIMP_MODIFIER_ACTION_BRUSH_SIZE, NC_("modifier-action", "Change brush size relatively"), NULL },
     { 0, NULL, NULL }
   };
 
diff --git a/app/display/display-enums.h b/app/display/display-enums.h
index c251441837..bcb81028e5 100644
--- a/app/display/display-enums.h
+++ b/app/display/display-enums.h
@@ -270,15 +270,14 @@ typedef enum
   GIMP_MODIFIER_ACTION_NONE,                    /*< desc="No action"                          >*/
   GIMP_MODIFIER_ACTION_PANNING,                 /*< desc="Pan"                                >*/
   GIMP_MODIFIER_ACTION_ZOOMING,                 /*< desc="Zoom"                               >*/
-  GIMP_MODIFIER_ACTION_ROTATING,                /*< desc="Rotate"                             >*/
-  GIMP_MODIFIER_ACTION_STEP_ROTATING,           /*< desc="Rotate by 15 degree steps"          >*/
+  GIMP_MODIFIER_ACTION_ROTATING,                /*< desc="Rotate View"                        >*/
+  GIMP_MODIFIER_ACTION_STEP_ROTATING,           /*< desc="Rotate View by 15 degree steps"     >*/
   GIMP_MODIFIER_ACTION_LAYER_PICKING,           /*< desc="Pick a layer"                       >*/
 
   GIMP_MODIFIER_ACTION_MENU,                    /*< desc="Display the menu"                   >*/
 
   GIMP_MODIFIER_ACTION_BRUSH_PIXEL_SIZE,        /*< desc="Change brush size in canvas pixels" >*/
   GIMP_MODIFIER_ACTION_BRUSH_RADIUS_PIXEL_SIZE, /*< desc="Change brush radius' size in canvas pixels" >*/
-  GIMP_MODIFIER_ACTION_BRUSH_SIZE               /*< desc="Change brush size relatively"       >*/
 } GimpModifierAction;
 
 
diff --git a/app/display/gimpdisplayshell-tool-events.c b/app/display/gimpdisplayshell-tool-events.c
index b03a2b0125..8fd0c85e3c 100644
--- a/app/display/gimpdisplayshell-tool-events.c
+++ b/app/display/gimpdisplayshell-tool-events.c
@@ -590,7 +590,6 @@ gimp_display_shell_canvas_tool_events (GtkWidget        *canvas,
               case GIMP_MODIFIER_ACTION_ROTATING:
               case GIMP_MODIFIER_ACTION_STEP_ROTATING:
               case GIMP_MODIFIER_ACTION_LAYER_PICKING:
-              case GIMP_MODIFIER_ACTION_BRUSH_SIZE:
               case GIMP_MODIFIER_ACTION_BRUSH_PIXEL_SIZE:
               case GIMP_MODIFIER_ACTION_BRUSH_RADIUS_PIXEL_SIZE:
                 gimp_display_shell_start_scrolling (shell, event, state,
@@ -742,7 +741,6 @@ gimp_display_shell_canvas_tool_events (GtkWidget        *canvas,
                      shell->display->config->space_bar_action != GIMP_SPACE_BAR_ACTION_PAN))
                   gimp_display_shell_stop_scrolling (shell, event);
                 break;
-              case GIMP_MODIFIER_ACTION_BRUSH_SIZE:
               case GIMP_MODIFIER_ACTION_BRUSH_PIXEL_SIZE:
               case GIMP_MODIFIER_ACTION_BRUSH_RADIUS_PIXEL_SIZE:
                 gimp_display_shell_stop_scrolling (shell, event);
@@ -1744,7 +1742,6 @@ gimp_display_shell_start_scrolling (GimpDisplayShell *shell,
       break;
     case GIMP_MODIFIER_ACTION_BRUSH_PIXEL_SIZE:
     case GIMP_MODIFIER_ACTION_BRUSH_RADIUS_PIXEL_SIZE:
-    case GIMP_MODIFIER_ACTION_BRUSH_SIZE:
         {
           Gimp     *gimp        = gimp_display_get_gimp (shell->display);
           GimpTool *active_tool = tool_manager_get_active (gimp);
@@ -1771,9 +1768,8 @@ gimp_display_shell_stop_scrolling (GimpDisplayShell *shell,
     {
     case GIMP_MODIFIER_ACTION_BRUSH_PIXEL_SIZE:
     case GIMP_MODIFIER_ACTION_BRUSH_RADIUS_PIXEL_SIZE:
-    case GIMP_MODIFIER_ACTION_BRUSH_SIZE:
         {
-          Gimp     *gimp       = gimp_display_get_gimp (shell->display);
+          Gimp     *gimp        = gimp_display_get_gimp (shell->display);
           GimpTool *active_tool = tool_manager_get_active (gimp);
 
           if (GIMP_IS_PAINT_TOOL (active_tool))
@@ -1861,7 +1857,6 @@ gimp_display_shell_handle_scrolling (GimpDisplayShell *shell,
       size_multiplier = 2.0;
       size_update_pos = FALSE;
     case GIMP_MODIFIER_ACTION_BRUSH_PIXEL_SIZE:
-    case GIMP_MODIFIER_ACTION_BRUSH_SIZE:
         {
           GimpDisplay *display     = shell->display;
           Gimp        *gimp        = gimp_display_get_gimp (display);
diff --git a/app/display/gimpmodifiersmanager.c b/app/display/gimpmodifiersmanager.c
index c2b86958fa..087496ae92 100644
--- a/app/display/gimpmodifiersmanager.c
+++ b/app/display/gimpmodifiersmanager.c
@@ -365,7 +365,7 @@ gimp_modifiers_manager_get_action (GimpModifiersManager *manager,
   else if (button == 3)
     {
       if (mod_state == GDK_MOD1_MASK)
-        retval = GIMP_MODIFIER_ACTION_BRUSH_SIZE;
+        retval = GIMP_MODIFIER_ACTION_BRUSH_PIXEL_SIZE;
       else if (mod_state == 0)
         retval = GIMP_MODIFIER_ACTION_MENU;
     }
@@ -577,7 +577,7 @@ gimp_modifiers_manager_initialize (GimpModifiersManager *manager,
 
           mapping = g_slice_new (GimpModifierMapping);
           mapping->modifiers  = GDK_MOD1_MASK;
-          mapping->mod_action = GIMP_MODIFIER_ACTION_BRUSH_SIZE;
+          mapping->mod_action = GIMP_MODIFIER_ACTION_BRUSH_PIXEL_SIZE;
           gimp_modifiers_manager_get_keys (device, 3, mapping->modifiers,
                                            &actions_key, NULL);
           g_hash_table_insert (manager->p->actions, actions_key, mapping);