Consistently use "Color Sampler (Tool)" terminology in interface and code

krita/data/cursors/color-picker_image_background.xpm → krita/data/cursors/color-sampler_image_background.xpm

 /* XPM */
-static char * color_picker_image_background_xpm[] = {
+static char * color_sampler_image_background_xpm[] = {
 "33 31 3 1",
 " 	c None",
 ".	c #FFFFFF",

krita/data/cursors/color-picker_image_foreground.xpm → krita/data/cursors/color-sampler_image_foreground.xpm

 /* XPM */
-static char * color_picker_image_foreground_xpm[] = {
+static char * color_sampler_image_foreground_xpm[] = {
 "33 31 3 1",
 " 	c None",
 ".	c #FFFFFF",

krita/data/cursors/color-picker_layer_background.xpm → krita/data/cursors/color-sampler_layer_background.xpm

 /* XPM */
-static char * color_picker_layer_background_xpm[] = {
+static char * color_sampler_layer_background_xpm[] = {
 "33 31 3 1",
 " 	c None",
 ".	c #FFFFFF",

krita/data/cursors/color-picker_layer_foreground.xpm → krita/data/cursors/color-sampler_layer_foreground.xpm

 /* XPM */
-static char * color_picker_layer_foreground_xpm[] = {
+static char * color_sampler_layer_foreground_xpm[] = {
 "33 31 3 1",
 " 	c None",
 ".	c #FFFFFF",

krita/data/cursors/cursors.qrc

@@ -5,10 +5,10 @@
 -->
 <RCC version="1.0">
     <qresource>
-        <file>color-picker_image_background.xpm</file>
-        <file>color-picker_image_foreground.xpm</file>
-        <file>color-picker_layer_background.xpm</file>
-        <file>color-picker_layer_foreground.xpm</file>
+        <file>color-sampler_image_background.xpm</file>
+        <file>color-sampler_image_foreground.xpm</file>
+        <file>color-sampler_layer_background.xpm</file>
+        <file>color-sampler_layer_foreground.xpm</file>
         <file>cursor-cross.xpm</file>
         <file>cursor-pixel-white.xpm</file>
         <file>cursor-pixel-black.xpm</file>
@@ -27,6 +27,6 @@
         <file>zoom_discrete.xpm</file>
         <file>zoom_smooth.xpm</file>
         <file>tool_freehand_cursor.png</file>
-        <file>tool_color_picker_cursor.png</file>
+        <file>tool_color_sampler_cursor.png</file>
     </qresource>
 </RCC>

krita/data/kritarc

@@ -373,6 +373,6 @@ actionButtonDoubleClick=erase_action
 actionGestureCircleCCW=shift_brush_color_counter_clockwise
 actionGestureCircleCW=shift_brush_color_clockwise
 actionGestureSwipeDown=make_brush_color_darker
-actionGestureSwipeRight=KritaSelected/KisToolColorPicker
+actionGestureSwipeRight=KritaSelected/KisToolColorSampler
 actionGestureSwipeLeft=KritaShape/KisToolBrush
 actionGestureSwipeUp=make_brush_color_lighter

krita/data/shortcuts/paint_tool_sai_compatible.shortcuts

@@ -220,7 +220,7 @@ krita_filter_top edge detections=none
 krita_filter_unsharp=none
 krita_filter_waveletnoisereducer=none
 krita_filter_wave=none
-KritaSelected/KisToolColorPicker=none
+KritaSelected/KisToolColorSampler=none
 KritaShape/KisToolBrush=B
 KritaShape/KisToolDyna=none
 KritaShape/KisToolEllipse=none

krita/data/shortcuts/photoshop_compatible.shortcuts

@@ -220,7 +220,7 @@ krita_filter_top edge detections=none
 krita_filter_unsharp=none
 krita_filter_waveletnoisereducer=none
 krita_filter_wave=none
-KritaSelected/KisToolColorPicker=I
+KritaSelected/KisToolColorSampler=I
 KritaShape/KisToolBrush=B
 KritaShape/KisToolDyna=none
 KritaShape/KisToolEllipse=none

krita/data/shortcuts/tablet_pro.shortcuts

@@ -222,7 +222,7 @@ krita_filter_top edge detections=none
 krita_filter_unsharp=none
 krita_filter_waveletnoisereducer=none
 krita_filter_wave=none
-KritaSelected/KisToolColorPicker=I
+KritaSelected/KisToolColorSampler=I
 KritaShape/KisToolBrush=B
 KritaShape/KisToolDyna=none
 KritaShape/KisToolEllipse=none

krita/krita.action

@@ -1402,12 +1402,12 @@
       <isCheckable>false</isCheckable>
       <statusTip></statusTip>
     </Action>
-    <Action name="KritaSelected/KisToolColorPicker">
-      <icon>krita_tool_color_picker</icon>
-      <text>Color Picker</text>
+
+      <icon>krita_tool_color_sampler</icon>
+      <text>Color Sampler</text>
       <whatsThis></whatsThis>
-      <toolTip>Select a color from the image or current layer</toolTip>
-      <iconText>Color Picker</iconText>
+      <toolTip>Sample a color from the image or current layer</toolTip>
+      <iconText>Color Sampler</iconText>
       <shortcut>P</shortcut>
       <isCheckable>false</isCheckable>
       <statusTip></statusTip>

krita/pics/tools/SVG/16/tools-svg-16-icons.qrc

@@ -9,7 +9,7 @@
         <file>dark_format-fill-color.svg</file>
         <file>dark_krita_draw_path.svg</file>
         <file>dark_krita_tool_color_fill.svg</file>
-        <file>dark_krita_tool_color_picker.svg</file>
+        <file>dark_krita_tool_color_sampler.svg</file>
         <file>dark_krita_tool_dyna.svg</file>
         <file>dark_krita_tool_ellipse.svg</file>
         <file>dark_krita_tool_freehand.svg</file>
@@ -43,7 +43,7 @@
         <file>light_format-fill-color.svg</file>
         <file>light_krita_draw_path.svg</file>
         <file>light_krita_tool_color_fill.svg</file>
-        <file>light_krita_tool_color_picker.svg</file>
+        <file>light_krita_tool_color_sampler.svg</file>
         <file>light_krita_tool_dyna.svg</file>
         <file>light_krita_tool_ellipse.svg</file>
         <file>light_krita_tool_freehand.svg</file>

libs/flake/KoToolBase.h

@@ -398,7 +398,7 @@ Q_SIGNALS:
      * Emitted when this tool wants itself to temporarily be replaced by another tool.
      * For instance, a paint tool could desire to be
      * temporarily replaced by a pan tool which could be temporarily
-     * replaced by a colorpicker.
+     * replaced by a color sampler.
      * @param id the identification of the desired tool
      */
     void activateTemporary(const QString &id);

libs/global/kis_acs_pixel_cache_renderer.h

@@ -18,24 +18,24 @@ namespace Acs {
     class PixelCacheRenderer {
     public:
         /**
-         * \p Picker class must provide one method:
-         *     - KoColor Picker::colorAt(float x, float y);
+         * \p Sampler class must provide one method:
+         *     - KoColor Sampler::colorAt(float x, float y);
          *
          * How to handle High DPI:
-         *  - pickRect - is in device independent pixels coordinates space
+         *  - sampleRect - is in device independent pixels coordinates space
          *     (amount of space on the widget)
          *  - devicePixelRatioF - the amount of UI scaling
          *  - pixelCache and realPixelCache gets the size of
-         *     pickRect.size()*devicePixelRatioF
+         *     sampleRect.size()*devicePixelRatioF
          *     and sets the device pixel ratio,
-         *     and color pickers need to take it into account.
+         *     and color samplers need to take it into account.
          *  That way you can paint on the cache the same way you'd paint on a low dpi display
          *    and then just use painter->drawImage() and it works.
          */
-        template <class Picker>
-        static void render(Picker *picker,
+        template <class Sampler>
+        static void render(Sampler *sampler,
                            const KisDisplayColorConverter *converter,
-                           const QRect &pickRect,
+                           const QRect &sampleRect,
                            KisPaintDeviceSP &realPixelCache,
                            QImage &pixelCache,
                            QPoint &pixelCacheOffset,
@@ -50,11 +50,11 @@ namespace Acs {
 
                 KoColor color;
 
-                QRect pickRectHighDPI = QRect(pickRect.topLeft(), pickRect.size()*devicePixelRatioF);
-                KisSequentialIterator it(realPixelCache, pickRectHighDPI);
+                QRect sampleRectHighDPI = QRect(sampleRect.topLeft(), sampleRect.size()*devicePixelRatioF);
+                KisSequentialIterator it(realPixelCache, sampleRectHighDPI);
 
                 while (it.nextPixel()) {
-                    color = picker->colorAt(it.x()/devicePixelRatioF, it.y()/devicePixelRatioF);
+                    color = sampler->colorAt(it.x()/devicePixelRatioF, it.y()/devicePixelRatioF);
                     memcpy(it.rawData(), color.data(), pixelSize);
                 }
 
@@ -62,7 +62,7 @@ namespace Acs {
                 // NOTE: toQImage() function of the converter copies exactBounds() only!
                 pixelCache = converter->toQImage(realPixelCache);
                 pixelCache.setDevicePixelRatio(devicePixelRatioF);
-                pixelCacheOffset = realPixelCache->exactBounds().topLeft()/devicePixelRatioF - pickRect.topLeft();
+                pixelCacheOffset = realPixelCache->exactBounds().topLeft()/devicePixelRatioF - sampleRect.topLeft();
         }
     };
 }

libs/global/kis_acs_types.h

@@ -38,7 +38,7 @@ namespace Acs {
     }
 
     template <class PaintDeviceSP>
-    KoColor pickColor(PaintDeviceSP device, const QPoint &pt) {
+    KoColor sampleColor(PaintDeviceSP device, const QPoint &pt) {
         KoColor color;
         if (device) {
             (void) device->pixel(pt.x(), pt.y(), &color);

libs/image/kis_base_node.cpp

@@ -111,7 +111,7 @@ KisBaseNode::~KisBaseNode()
     delete m_d;
 }
 
-KisPaintDeviceSP KisBaseNode::colorPickSourceDevice() const
+KisPaintDeviceSP KisBaseNode::colorSampleSourceDevice() const
 {
     return projection();
 }

libs/image/kis_base_node.h

@@ -146,11 +146,11 @@ public:
     virtual KisPaintDeviceSP projection() const = 0;
 
     /**
-     * @return a special device from where the color picker tool should pick
+     * @return a special device from where the color sampler tool should sample
      * color when in layer-only mode. For most of the nodes just shortcuts
      * to projection() device. TODO: can it be null?
      */
-    virtual KisPaintDeviceSP colorPickSourceDevice() const;
+    virtual KisPaintDeviceSP colorSampleSourceDevice() const;
 
     virtual const KoColorSpace *colorSpace() const = 0;
 

libs/image/kis_cross_device_color_picker.h → libs/image/kis_cross_device_color_sampler.h

@@ -4,14 +4,14 @@
  *  SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-#ifndef __KIS_CROSS_DEVICE_COLOR_PICKER_H
-#define __KIS_CROSS_DEVICE_COLOR_PICKER_H
+#ifndef __KIS_CROSS_DEVICE_COLOR_SAMPLER_H
+#define __KIS_CROSS_DEVICE_COLOR_SAMPLER_H
 
 #include "KoColorSpace.h"
 #include "kis_random_sub_accessor.h"
 
 
-struct PickerTraitReal {
+struct SamplerTraitReal {
     typedef qreal coord_type;
     typedef KisRandomSubAccessorSP accessor_type;
     static inline accessor_type createAccessor(KisPaintDeviceSP dev) {
@@ -28,7 +28,7 @@ struct PickerTraitReal {
     }
 };
 
-struct PickerTraitInt {
+struct SamplerTraitInt {
     typedef int coord_type;
     typedef KisRandomConstAccessorSP accessor_type;
     static inline accessor_type createAccessor(KisPaintDeviceSP dev) {
@@ -46,11 +46,11 @@ struct PickerTraitInt {
 };
 
 /**
- * The picker class is supposed to help to pick color from one device
+ * The sampler class is supposed to help to sample color from one device
  * and automatically convert it to the color space of another device
  *
  * WARNING: Please note, that if you want to access correct rawData(),
- *          you shouldn't store the picker class (as well as any
+ *          you shouldn't store the sampler class (as well as any
  *          random accessor class) across different calls to
  *          paintAt. This is related to the fact that
  *          KisRandomAccessor has an internal cache of the tiles, but
@@ -59,35 +59,35 @@ struct PickerTraitInt {
  */
 
 template <class Traits>
-class KisCrossDeviceColorPickerImpl
+class KisCrossDeviceColorSamplerImpl
 {
 public:
-    KisCrossDeviceColorPickerImpl(KisPaintDeviceSP src, KisPaintDeviceSP dst) {
+    KisCrossDeviceColorSamplerImpl(KisPaintDeviceSP src, KisPaintDeviceSP dst) {
         init(src, dst);
     }
 
-    KisCrossDeviceColorPickerImpl(KisPaintDeviceSP src, KisFixedPaintDeviceSP dst) {
+    KisCrossDeviceColorSamplerImpl(KisPaintDeviceSP src, KisFixedPaintDeviceSP dst) {
         init(src, dst);
     }
 
-    KisCrossDeviceColorPickerImpl(KisPaintDeviceSP src, const KoColor &dst) {
+    KisCrossDeviceColorSamplerImpl(KisPaintDeviceSP src, const KoColor &dst) {
         init(src, &dst);
     }
 
-    ~KisCrossDeviceColorPickerImpl() {
+    ~KisCrossDeviceColorSamplerImpl() {
         delete[] m_data;
     }
 
-    inline void pickColor(typename Traits::coord_type x,
+    inline void sampleColor(typename Traits::coord_type x,
                           typename Traits::coord_type y,
                           quint8 *dst) {
-        pickColorImpl<false>(x, y, dst);
+        sampleColorImpl<false>(x, y, dst);
     }
 
-    inline void pickOldColor(typename Traits::coord_type x,
+    inline void sampleOldColor(typename Traits::coord_type x,
                              typename Traits::coord_type y,
                              quint8 *dst) {
-        pickColorImpl<true>(x, y, dst);
+        sampleColorImpl<true>(x, y, dst);
     }
 
 private:
@@ -101,7 +101,7 @@ private:
     }
 
     template <bool useOldData>
-    inline void pickColorImpl(typename Traits::coord_type x,
+    inline void sampleColorImpl(typename Traits::coord_type x,
                               typename Traits::coord_type y,
                               quint8 *dst) {
         m_accessor->moveTo(x, y);
@@ -120,7 +120,7 @@ private:
     quint8 *m_data;
 };
 
-typedef KisCrossDeviceColorPickerImpl<PickerTraitReal> KisCrossDeviceColorPicker;
-typedef KisCrossDeviceColorPickerImpl<PickerTraitInt> KisCrossDeviceColorPickerInt;
+typedef KisCrossDeviceColorSamplerImpl<SamplerTraitReal> KisCrossDeviceColorSampler;
+typedef KisCrossDeviceColorSamplerImpl<SamplerTraitInt> KisCrossDeviceColorSamplerInt;
 
-#endif /* __KIS_CROSS_DEVICE_COLOR_PICKER_H */
+#endif /* __KIS_CROSS_DEVICE_COLOR_SAMPLER_H */

libs/image/kis_paint_device.h

@@ -665,13 +665,13 @@ public:
      * 2) Do *not* expect that the color spaces of the destination and
      *    the temporary device would coincide. If you need to copy a
      *    single pixel from one device to another, you can use
-     *    KisCrossDeviceColorPicker class, that will handle all the
+     *    KisCrossDeviceColorSampler class, that will handle all the
      *    necessary conversions for you.
      *
      * \see createCompositionSourceDeviceFixed()
      * \see compositionSourceColorSpace()
-     * \see KisCrossDeviceColorPicker
-     * \see KisCrossDeviceColorPickerInt
+     * \see KisCrossDeviceColorSampler
+     * \see KisCrossDeviceColorSamplerInt
      */
     KisPaintDeviceSP createCompositionSourceDevice() const;
 

libs/image/lazybrush/kis_colorize_mask.cpp

@@ -464,7 +464,7 @@ KisPaintDeviceSP KisColorizeMask::coloringProjection() const
     return m_d->coloringProjection;
 }
 
-KisPaintDeviceSP KisColorizeMask::colorPickSourceDevice() const
+KisPaintDeviceSP KisColorizeMask::colorSampleSourceDevice() const
 {
     return
         m_d->shouldShowColoring() && !m_d->coloringProjection->extent().isEmpty() ?

libs/image/lazybrush/kis_colorize_mask.h

@@ -50,7 +50,7 @@ public:
     KisPaintDeviceSP paintDevice() const override;
     KisPaintDeviceSP coloringProjection() const;
 
-    KisPaintDeviceSP colorPickSourceDevice() const override;
+    KisPaintDeviceSP colorSampleSourceDevice() const override;
 
     KisNodeSP clone() const override {
         return KisNodeSP(new KisColorizeMask(*this));

libs/libqml/qml/images/svg/icon-colorpicker.svg → libs/libqml/qml/images/svg/icon-colorsampler.svg

@@ -15,7 +15,7 @@
    id="svg3531"
    version="1.1"
    inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="icon-colorpicker.svg">
+   sodipodi:docname="icon-colorsampler.svg">
   <defs
      id="defs3533">
     <linearGradient

libs/libqml/qml/panels/ColorPanel.qml

@@ -19,17 +19,17 @@ Panel {
             height: parent.height;
             width: height;
             onChooseBGChanged: {
-                if (toolManager.currentTool !== null && toolManager.currentTool.toolId() === "KritaSelected/KisToolColorPicker") {
+                if (toolManager.currentTool !== null && toolManager.currentTool.toolId() === "KritaSelected/KisToolColorSampler") {
                     toolManager.currentTool.toForeground = !swatch.chooseBG;
                 }
             }
         },
         Button {
-            id: colorPicker;
+            id: colorSampler;
             width: height;
             height: Constants.ToolbarButtonSize;
-            image: Settings.theme.icon("colorpicker");
-            onClicked: toolManager.requestToolChange("KritaSelected/KisToolColorPicker");
+            image: Settings.theme.icon("colorsampler");
+            onClicked: toolManager.requestToolChange("KritaSelected/KisToolColorSampler");
         },
         Item {