Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Krita
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tusooa Zhu
Krita
Commits
08968e7b
Commit
08968e7b
authored
Jul 17, 2018
by
Victor Wåhlström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extracted filter category KoIDs to a separate file
Ref T6560 Differential Revision
https://phabricator.kde.org/D14164
parent
55fcc4d4
Changes
43
Hide whitespace changes
Inline
Side-by-side
Showing
43 changed files
with
158 additions
and
115 deletions
+158
-115
libs/image/CMakeLists.txt
libs/image/CMakeLists.txt
+1
-0
libs/image/filter/kis_filter.cc
libs/image/filter/kis_filter.cc
+0
-52
libs/image/filter/kis_filter.h
libs/image/filter/kis_filter.h
+0
-15
libs/image/filter/kis_filter_category_ids.cpp
libs/image/filter/kis_filter_category_ids.cpp
+33
-0
libs/image/filter/kis_filter_category_ids.h
libs/image/filter/kis_filter_category_ids.h
+38
-0
plugins/filters/asccdl/kis_asccdl_filter.cpp
plugins/filters/asccdl/kis_asccdl_filter.cpp
+2
-1
plugins/filters/blur/kis_blur_filter.cpp
plugins/filters/blur/kis_blur_filter.cpp
+2
-1
plugins/filters/blur/kis_gaussian_blur_filter.cpp
plugins/filters/blur/kis_gaussian_blur_filter.cpp
+2
-1
plugins/filters/blur/kis_lens_blur_filter.cpp
plugins/filters/blur/kis_lens_blur_filter.cpp
+2
-1
plugins/filters/blur/kis_motion_blur_filter.cpp
plugins/filters/blur/kis_motion_blur_filter.cpp
+2
-1
plugins/filters/colors/kis_color_to_alpha.cpp
plugins/filters/colors/kis_color_to_alpha.cpp
+2
-1
plugins/filters/colors/kis_minmax_filters.cpp
plugins/filters/colors/kis_minmax_filters.cpp
+3
-2
plugins/filters/colorsfilters/colorsfilters.cpp
plugins/filters/colorsfilters/colorsfilters.cpp
+2
-1
plugins/filters/colorsfilters/kis_color_balance_filter.cpp
plugins/filters/colorsfilters/kis_color_balance_filter.cpp
+2
-1
plugins/filters/colorsfilters/kis_desaturate_filter.cpp
plugins/filters/colorsfilters/kis_desaturate_filter.cpp
+2
-1
plugins/filters/colorsfilters/kis_hsv_adjustment_filter.cpp
plugins/filters/colorsfilters/kis_hsv_adjustment_filter.cpp
+2
-1
plugins/filters/colorsfilters/kis_multichannel_filter_base.cpp
...ns/filters/colorsfilters/kis_multichannel_filter_base.cpp
+2
-1
plugins/filters/convertheightnormalmap/kis_convert_height_to_normal_map_filter.cpp
...ightnormalmap/kis_convert_height_to_normal_map_filter.cpp
+2
-1
plugins/filters/convolutionfilters/convolutionfilters.cpp
plugins/filters/convolutionfilters/convolutionfilters.cpp
+9
-8
plugins/filters/dodgeburn/DodgeBurn.cpp
plugins/filters/dodgeburn/DodgeBurn.cpp
+2
-1
plugins/filters/edgedetection/kis_edge_detection_filter.cpp
plugins/filters/edgedetection/kis_edge_detection_filter.cpp
+2
-1
plugins/filters/embossfilter/kis_emboss_filter.cpp
plugins/filters/embossfilter/kis_emboss_filter.cpp
+2
-1
plugins/filters/example/example.cpp
plugins/filters/example/example.cpp
+2
-1
plugins/filters/fastcolortransfer/fastcolortransfer.cpp
plugins/filters/fastcolortransfer/fastcolortransfer.cpp
+2
-1
plugins/filters/gradientmap/krita_filter_gradient_map.cpp
plugins/filters/gradientmap/krita_filter_gradient_map.cpp
+2
-1
plugins/filters/halftone/kis_halftone_filter.cpp
plugins/filters/halftone/kis_halftone_filter.cpp
+2
-1
plugins/filters/imageenhancement/kis_simple_noise_reducer.cpp
...ins/filters/imageenhancement/kis_simple_noise_reducer.cpp
+2
-1
plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp
.../filters/imageenhancement/kis_wavelet_noise_reduction.cpp
+2
-1
plugins/filters/indexcolors/indexcolors.cpp
plugins/filters/indexcolors/indexcolors.cpp
+2
-1
plugins/filters/levelfilter/kis_level_filter.cpp
plugins/filters/levelfilter/kis_level_filter.cpp
+2
-1
plugins/filters/noisefilter/noisefilter.cpp
plugins/filters/noisefilter/noisefilter.cpp
+2
-1
plugins/filters/normalize/kis_normalize.cpp
plugins/filters/normalize/kis_normalize.cpp
+3
-2
plugins/filters/oilpaintfilter/kis_oilpaint_filter.cpp
plugins/filters/oilpaintfilter/kis_oilpaint_filter.cpp
+2
-1
plugins/filters/phongbumpmap/kis_phong_bumpmap_filter.cpp
plugins/filters/phongbumpmap/kis_phong_bumpmap_filter.cpp
+3
-2
plugins/filters/pixelizefilter/kis_pixelize_filter.cpp
plugins/filters/pixelizefilter/kis_pixelize_filter.cpp
+2
-1
plugins/filters/posterize/posterize.cpp
plugins/filters/posterize/posterize.cpp
+2
-1
plugins/filters/raindropsfilter/kis_raindrops_filter.cpp
plugins/filters/raindropsfilter/kis_raindrops_filter.cpp
+2
-1
plugins/filters/randompickfilter/randompickfilter.cpp
plugins/filters/randompickfilter/randompickfilter.cpp
+2
-1
plugins/filters/roundcorners/kis_round_corners_filter.cpp
plugins/filters/roundcorners/kis_round_corners_filter.cpp
+2
-1
plugins/filters/smalltilesfilter/kis_small_tiles_filter.cpp
plugins/filters/smalltilesfilter/kis_small_tiles_filter.cpp
+2
-1
plugins/filters/threshold/threshold.cpp
plugins/filters/threshold/threshold.cpp
+2
-1
plugins/filters/unsharp/kis_unsharp_filter.cpp
plugins/filters/unsharp/kis_unsharp_filter.cpp
+2
-1
plugins/filters/wavefilter/wavefilter.cpp
plugins/filters/wavefilter/wavefilter.cpp
+2
-1
No files found.
libs/image/CMakeLists.txt
View file @
08968e7b
...
...
@@ -115,6 +115,7 @@ set(kritaimage_LIB_SRCS
processing/kis_transform_processing_visitor.cpp
processing/kis_mirror_processing_visitor.cpp
filter/kis_filter.cc
filter/kis_filter_category_ids.cpp
filter/kis_filter_configuration.cc
filter/kis_color_transformation_configuration.cc
filter/kis_filter_registry.cc
...
...
libs/image/filter/kis_filter.cc
View file @
08968e7b
...
...
@@ -31,58 +31,6 @@
#include <kis_painter.h>
#include <KoUpdater.h>
KoID
KisFilter
::
categoryAdjust
()
{
return
KoID
(
"adjust_filters"
,
i18n
(
"Adjust"
));
}
KoID
KisFilter
::
categoryArtistic
()
{
return
KoID
(
"artistic_filters"
,
i18n
(
"Artistic"
));
}
KoID
KisFilter
::
categoryBlur
()
{
return
KoID
(
"blur_filters"
,
i18n
(
"Blur"
));
}
KoID
KisFilter
::
categoryColors
()
{
return
KoID
(
"color_filters"
,
i18n
(
"Colors"
));
}
KoID
KisFilter
::
categoryEdgeDetection
()
{
return
KoID
(
"edge_filters"
,
i18n
(
"Edge Detection"
));
}
KoID
KisFilter
::
categoryEmboss
()
{
return
KoID
(
"emboss_filters"
,
i18n
(
"Emboss"
));
}
KoID
KisFilter
::
categoryEnhance
()
{
return
KoID
(
"enhance_filters"
,
i18n
(
"Enhance"
));
}
KoID
KisFilter
::
categoryMap
()
{
return
KoID
(
"map_filters"
,
i18n
(
"Map"
));
}
KoID
KisFilter
::
categoryNonPhotorealistic
()
{
return
KoID
(
"nonphotorealistic_filters"
,
i18n
(
"Non-photorealistic"
));
}
KoID
KisFilter
::
categoryOther
()
{
return
KoID
(
"other_filters"
,
i18n
(
"Other"
));
}
KisFilter
::
KisFilter
(
const
KoID
&
_id
,
const
KoID
&
category
,
const
QString
&
entry
)
:
KisBaseProcessor
(
_id
,
category
,
entry
),
m_supportsLevelOfDetail
(
false
)
...
...
libs/image/filter/kis_filter.h
View file @
08968e7b
...
...
@@ -37,19 +37,6 @@
*/
class
KRITAIMAGE_EXPORT
KisFilter
:
public
KisBaseProcessor
{
public:
static
KoID
categoryAdjust
();
static
KoID
categoryArtistic
();
static
KoID
categoryBlur
();
static
KoID
categoryColors
();
static
KoID
categoryEdgeDetection
();
static
KoID
categoryEmboss
();
static
KoID
categoryEnhance
();
static
KoID
categoryMap
();
static
KoID
categoryNonPhotorealistic
();
static
KoID
categoryOther
();
public:
/**
...
...
@@ -58,8 +45,6 @@ public:
KisFilter
(
const
KoID
&
id
,
const
KoID
&
category
,
const
QString
&
entry
);
~
KisFilter
()
override
;
public:
/**
* Override this function with the implementation of your filter.
*
...
...
libs/image/filter/kis_filter_category_ids.cpp
0 → 100644
View file @
08968e7b
/*
* Copyright (c) 2018 Victor Wåhlström <victor.wahlstrom@initiali.se>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#include "kis_filter_category_ids.h"
#include <klocalizedstring.h>
const
KoID
FiltersCategoryAdjustId
(
"adjust_filters"
,
i18n
(
"Adjust"
));
const
KoID
FiltersCategoryArtisticId
(
"artistic_filters"
,
i18n
(
"Artistic"
));
const
KoID
FiltersCategoryBlurId
(
"blur_filters"
,
i18n
(
"Blur"
));
const
KoID
FiltersCategoryColorId
(
"color_filters"
,
i18n
(
"Colors"
));
const
KoID
FiltersCategoryEdgeDetectionId
(
"edge_filters"
,
i18n
(
"Edge Detection"
));
const
KoID
FiltersCategoryEmbossId
(
"emboss_filters"
,
i18n
(
"Emboss"
));
const
KoID
FiltersCategoryEnhanceId
(
"enhance_filters"
,
i18n
(
"Enhance"
));
const
KoID
FiltersCategoryMapId
(
"map_filters"
,
i18n
(
"Map"
));
const
KoID
FiltersCategoryNonPhotorealisticId
(
"nonphotorealistic_filters"
,
i18n
(
"Non-photorealistic"
));
const
KoID
FiltersCategoryOtherId
(
"other_filters"
,
i18n
(
"Other"
));
libs/image/filter/kis_filter_category_ids.h
0 → 100644
View file @
08968e7b
/*
* Copyright (c) 2018 Victor Wåhlström <victor.wahlstrom@initiali.se>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef _KIS_FILTER_CATEGORY_IDS_H_
#define _KIS_FILTER_CATEGORY_IDS_H_
#include <KoID.h>
#include "kritaimage_export.h"
extern
const
KoID
KRITAIMAGE_EXPORT
FiltersCategoryAdjustId
;
extern
const
KoID
KRITAIMAGE_EXPORT
FiltersCategoryArtisticId
;
extern
const
KoID
KRITAIMAGE_EXPORT
FiltersCategoryBlurId
;
extern
const
KoID
KRITAIMAGE_EXPORT
FiltersCategoryColorId
;
extern
const
KoID
KRITAIMAGE_EXPORT
FiltersCategoryEdgeDetectionId
;
extern
const
KoID
KRITAIMAGE_EXPORT
FiltersCategoryEmbossId
;
extern
const
KoID
KRITAIMAGE_EXPORT
FiltersCategoryEnhanceId
;
extern
const
KoID
KRITAIMAGE_EXPORT
FiltersCategoryMapId
;
extern
const
KoID
KRITAIMAGE_EXPORT
FiltersCategoryNonPhotorealisticId
;
extern
const
KoID
KRITAIMAGE_EXPORT
FiltersCategoryOtherId
;
#endif // _KIS_FILTER_CATEGORY_IDS_H_
plugins/filters/asccdl/kis_asccdl_filter.cpp
View file @
08968e7b
...
...
@@ -20,6 +20,7 @@
#include "kis_wdg_asccdl.h"
#include <kpluginfactory.h>
#include <klocalizedstring.h>
#include <filter/kis_filter_category_ids.h>
#include <filter/kis_filter_registry.h>
#include <filter/kis_color_transformation_configuration.h>
#include <qmath.h>
...
...
@@ -39,7 +40,7 @@ KritaASCCDL::~KritaASCCDL()
}
KisFilterASCCDL
::
KisFilterASCCDL
()
:
KisColorTransformationFilter
(
id
(),
categoryAdjust
()
,
i18n
(
"&Slope, Offset, Power..."
))
KisFilterASCCDL
::
KisFilterASCCDL
()
:
KisColorTransformationFilter
(
id
(),
FiltersCategoryAdjustId
,
i18n
(
"&Slope, Offset, Power..."
))
{
setSupportsPainting
(
true
);
setSupportsAdjustmentLayers
(
true
);
...
...
plugins/filters/blur/kis_blur_filter.cpp
View file @
08968e7b
...
...
@@ -28,6 +28,7 @@
#include "kis_wdg_blur.h"
#include "ui_wdgblur.h"
#include <filter/kis_filter_category_ids.h>
#include <filter/kis_filter_configuration.h>
#include <kis_selection.h>
#include <kis_paint_device.h>
...
...
@@ -36,7 +37,7 @@
#include "kis_lod_transform.h"
KisBlurFilter
::
KisBlurFilter
()
:
KisFilter
(
id
(),
categoryBlur
()
,
i18n
(
"&Blur..."
))
KisBlurFilter
::
KisBlurFilter
()
:
KisFilter
(
id
(),
FiltersCategoryBlurId
,
i18n
(
"&Blur..."
))
{
setSupportsPainting
(
true
);
setSupportsAdjustmentLayers
(
true
);
...
...
plugins/filters/blur/kis_gaussian_blur_filter.cpp
View file @
08968e7b
...
...
@@ -30,6 +30,7 @@
#include "ui_wdg_gaussian_blur.h"
#include <filter/kis_filter_category_ids.h>
#include <filter/kis_filter_configuration.h>
#include <kis_selection.h>
#include <kis_paint_device.h>
...
...
@@ -40,7 +41,7 @@
#include <math.h>
KisGaussianBlurFilter
::
KisGaussianBlurFilter
()
:
KisFilter
(
id
(),
categoryBlur
()
,
i18n
(
"&Gaussian Blur..."
))
KisGaussianBlurFilter
::
KisGaussianBlurFilter
()
:
KisFilter
(
id
(),
FiltersCategoryBlurId
,
i18n
(
"&Gaussian Blur..."
))
{
setSupportsPainting
(
true
);
setSupportsAdjustmentLayers
(
true
);
...
...
plugins/filters/blur/kis_lens_blur_filter.cpp
View file @
08968e7b
...
...
@@ -29,6 +29,7 @@
#include "ui_wdg_lens_blur.h"
#include <filter/kis_filter_category_ids.h>
#include <filter/kis_filter_configuration.h>
#include <kis_selection.h>
#include <kis_paint_device.h>
...
...
@@ -41,7 +42,7 @@
#include <math.h>
KisLensBlurFilter
::
KisLensBlurFilter
()
:
KisFilter
(
id
(),
categoryBlur
()
,
i18n
(
"&Lens Blur..."
))
KisLensBlurFilter
::
KisLensBlurFilter
()
:
KisFilter
(
id
(),
FiltersCategoryBlurId
,
i18n
(
"&Lens Blur..."
))
{
setSupportsPainting
(
true
);
setSupportsAdjustmentLayers
(
true
);
...
...
plugins/filters/blur/kis_motion_blur_filter.cpp
View file @
08968e7b
...
...
@@ -29,6 +29,7 @@
#include "ui_wdg_motion_blur.h"
#include <filter/kis_filter_category_ids.h>
#include <filter/kis_filter_configuration.h>
#include <kis_selection.h>
#include <kis_paint_device.h>
...
...
@@ -41,7 +42,7 @@
#include <math.h>
KisMotionBlurFilter
::
KisMotionBlurFilter
()
:
KisFilter
(
id
(),
categoryBlur
()
,
i18n
(
"&Motion Blur..."
))
KisMotionBlurFilter
::
KisMotionBlurFilter
()
:
KisFilter
(
id
(),
FiltersCategoryBlurId
,
i18n
(
"&Motion Blur..."
))
{
setSupportsPainting
(
true
);
setSupportsAdjustmentLayers
(
true
);
...
...
plugins/filters/colors/kis_color_to_alpha.cpp
View file @
08968e7b
...
...
@@ -28,6 +28,7 @@
#include "kis_progress_update_helper.h"
#include <kis_paint_device.h>
#include <kis_selection.h>
#include <filter/kis_filter_category_ids.h>
#include <filter/kis_filter_configuration.h>
#include <kis_processing_information.h>
...
...
@@ -37,7 +38,7 @@
#include <KisSequentialIteratorProgress.h>
KisFilterColorToAlpha
::
KisFilterColorToAlpha
()
:
KisFilter
(
id
(),
categoryColors
()
,
i18n
(
"&Color to Alpha..."
))
:
KisFilter
(
id
(),
FiltersCategoryColorId
,
i18n
(
"&Color to Alpha..."
))
{
setSupportsPainting
(
true
);
setSupportsAdjustmentLayers
(
true
);
...
...
plugins/filters/colors/kis_minmax_filters.cpp
View file @
08968e7b
...
...
@@ -21,6 +21,7 @@
#include "kis_minmax_filters.h"
#include <KoUpdater.h>
#include <KoChannelInfo.h>
#include <filter/kis_filter_category_ids.h>
#include <filter/kis_filter_configuration.h>
#include <kis_selection.h>
#include <kis_paint_device.h>
...
...
@@ -66,7 +67,7 @@ void minimize(const quint8* s, quint8* d, uint nbpixels)
}
}
KisFilterMax
::
KisFilterMax
()
:
KisFilter
(
id
(),
categoryColors
()
,
i18n
(
"M&aximize Channel"
))
KisFilterMax
::
KisFilterMax
()
:
KisFilter
(
id
(),
FiltersCategoryColorId
,
i18n
(
"M&aximize Channel"
))
{
setSupportsPainting
(
true
);
setSupportsLevelOfDetail
(
true
);
...
...
@@ -104,7 +105,7 @@ void KisFilterMax::processImpl(KisPaintDeviceSP device,
}
}
KisFilterMin
::
KisFilterMin
()
:
KisFilter
(
id
(),
categoryColors
()
,
i18n
(
"M&inimize Channel"
))
KisFilterMin
::
KisFilterMin
()
:
KisFilter
(
id
(),
FiltersCategoryColorId
,
i18n
(
"M&inimize Channel"
))
{
setSupportsPainting
(
true
);
setColorSpaceIndependence
(
FULLY_INDEPENDENT
);
...
...
plugins/filters/colorsfilters/colorsfilters.cpp
View file @
08968e7b
...
...
@@ -38,6 +38,7 @@
#include "KoBasicHistogramProducers.h"
#include <KoColorSpace.h>
#include <KoColorTransformation.h>
#include <filter/kis_filter_category_ids.h>
#include <filter/kis_filter_configuration.h>
#include <kis_paint_device.h>
#include <kis_processing_information.h>
...
...
@@ -85,7 +86,7 @@ ColorsFilters::~ColorsFilters()
//==================================================================
KisAutoContrast
::
KisAutoContrast
()
:
KisFilter
(
id
(),
categoryAdjust
()
,
i18n
(
"&Auto Contrast"
))
KisAutoContrast
::
KisAutoContrast
()
:
KisFilter
(
id
(),
FiltersCategoryAdjustId
,
i18n
(
"&Auto Contrast"
))
{
setSupportsPainting
(
false
);
setSupportsThreading
(
false
);
...
...
plugins/filters/colorsfilters/kis_color_balance_filter.cpp
View file @
08968e7b
...
...
@@ -18,13 +18,14 @@
*/
#include "kis_color_balance_filter.h"
#include <filter/kis_filter_category_ids.h>
#include "filter/kis_color_transformation_configuration.h"
#include "kis_selection.h"
#include "kis_paint_device.h"
#include "kis_processing_information.h"
KisColorBalanceFilter
::
KisColorBalanceFilter
()
:
KisColorTransformationFilter
(
id
(),
categoryAdjust
()
,
i18n
(
"&Color Balance..."
))
:
KisColorTransformationFilter
(
id
(),
FiltersCategoryAdjustId
,
i18n
(
"&Color Balance..."
))
{
setShortcut
(
QKeySequence
(
Qt
::
CTRL
+
Qt
::
Key_B
));
setSupportsPainting
(
true
);
...
...
plugins/filters/colorsfilters/kis_desaturate_filter.cpp
View file @
08968e7b
...
...
@@ -39,6 +39,7 @@
#include "KoBasicHistogramProducers.h"
#include <KoColorSpace.h>
#include <KoColorTransformation.h>
#include <filter/kis_filter_category_ids.h>
#include <filter/kis_color_transformation_configuration.h>
#include <kis_paint_device.h>
#include <kis_processing_information.h>
...
...
@@ -55,7 +56,7 @@
#include <kis_iterator_ng.h>
KisDesaturateFilter
::
KisDesaturateFilter
()
:
KisColorTransformationFilter
(
id
(),
categoryAdjust
()
,
i18n
(
"&Desaturate..."
))
:
KisColorTransformationFilter
(
id
(),
FiltersCategoryAdjustId
,
i18n
(
"&Desaturate..."
))
{
setShortcut
(
QKeySequence
(
Qt
::
CTRL
+
Qt
::
SHIFT
+
Qt
::
Key_U
));
setSupportsPainting
(
true
);
...
...
plugins/filters/colorsfilters/kis_hsv_adjustment_filter.cpp
View file @
08968e7b
...
...
@@ -19,6 +19,7 @@
#include "kis_hsv_adjustment_filter.h"
#include <filter/kis_filter_category_ids.h>
#include <filter/kis_color_transformation_configuration.h>
#include <kis_selection.h>
#include <kis_paint_device.h>
...
...
@@ -90,7 +91,7 @@ inline const WidgetSlidersConfig& getCurrentWidgetConfig(int type, bool colorize
}
KisHSVAdjustmentFilter
::
KisHSVAdjustmentFilter
()
:
KisColorTransformationFilter
(
id
(),
categoryAdjust
()
,
i18n
(
"&HSV Adjustment..."
))
:
KisColorTransformationFilter
(
id
(),
FiltersCategoryAdjustId
,
i18n
(
"&HSV Adjustment..."
))
{
setShortcut
(
QKeySequence
(
Qt
::
CTRL
+
Qt
::
Key_U
));
setSupportsPainting
(
true
);
...
...
plugins/filters/colorsfilters/kis_multichannel_filter_base.cpp
View file @
08968e7b
...
...
@@ -42,6 +42,7 @@
#include "kis_bookmarked_configuration_manager.h"
#include "kis_config_widget.h"
#include <filter/kis_filter_category_ids.h>
#include <filter/kis_filter_configuration.h>
#include <kis_selection.h>
#include <kis_paint_device.h>
...
...
@@ -52,7 +53,7 @@
#include "widgets/kis_curve_widget.h"
KisMultiChannelFilter
::
KisMultiChannelFilter
(
const
KoID
&
id
,
const
QString
&
entry
)
:
KisColorTransformationFilter
(
id
,
categoryAdjust
()
,
entry
)
:
KisColorTransformationFilter
(
id
,
FiltersCategoryAdjustId
,
entry
)
{
setSupportsPainting
(
true
);
setColorSpaceIndependence
(
TO_LAB16
);
...
...
plugins/filters/convertheightnormalmap/kis_convert_height_to_normal_map_filter.cpp
View file @
08968e7b
...
...
@@ -19,6 +19,7 @@
#include "kis_wdg_convert_height_to_normal_map.h"
#include <kpluginfactory.h>
#include <klocalizedstring.h>
#include <filter/kis_filter_category_ids.h>
#include <filter/kis_filter_registry.h>
#include <filter/kis_filter_configuration.h>
#include "kis_lod_transform.h"
...
...
@@ -37,7 +38,7 @@ KritaConvertHeightToNormalMapFilter::~KritaConvertHeightToNormalMapFilter()
{
}
KisConvertHeightToNormalMapFilter
::
KisConvertHeightToNormalMapFilter
()
:
KisFilter
(
id
(),
categoryEdgeDetection
()
,
i18n
(
"&Height to Normal Map..."
))
KisConvertHeightToNormalMapFilter
::
KisConvertHeightToNormalMapFilter
()
:
KisFilter
(
id
(),
FiltersCategoryEdgeDetectionId
,
i18n
(
"&Height to Normal Map..."
))
{
setSupportsPainting
(
true
);
setSupportsAdjustmentLayers
(
true
);
...
...
plugins/filters/convolutionfilters/convolutionfilters.cpp
View file @
08968e7b
...
...
@@ -29,6 +29,7 @@
#include <kis_convolution_kernel.h>
#include <kis_convolution_painter.h>
#include <filter/kis_filter_category_ids.h>
#include <filter/kis_filter_configuration.h>
#include <kis_selection.h>
#include <kis_paint_device.h>
...
...
@@ -56,7 +57,7 @@ KritaConvolutionFilters::~KritaConvolutionFilters()
}
KisSharpenFilter
::
KisSharpenFilter
()
:
KisConvolutionFilter
(
id
(),
categoryEnhance
()
,
i18n
(
"&Sharpen"
))
:
KisConvolutionFilter
(
id
(),
FiltersCategoryEnhanceId
,
i18n
(
"&Sharpen"
))
{
setSupportsPainting
(
true
);
setShowConfigurationWidget
(
false
);
...
...
@@ -70,7 +71,7 @@ KisSharpenFilter::KisSharpenFilter()
}
KisMeanRemovalFilter
::
KisMeanRemovalFilter
()
:
KisConvolutionFilter
(
id
(),
categoryEnhance
()
,
i18n
(
"&Mean Removal"
))
:
KisConvolutionFilter
(
id
(),
FiltersCategoryEnhanceId
,
i18n
(
"&Mean Removal"
))
{
setSupportsPainting
(
false
);
setShowConfigurationWidget
(
false
);
...
...
@@ -84,7 +85,7 @@ KisMeanRemovalFilter::KisMeanRemovalFilter()
}
KisEmbossLaplascianFilter
::
KisEmbossLaplascianFilter
()
:
KisConvolutionFilter
(
id
(),
categoryEmboss
()
,
i18n
(
"Emboss (Laplacian)"
))
:
KisConvolutionFilter
(
id
(),
FiltersCategoryEmbossId
,
i18n
(
"Emboss (Laplacian)"
))
{
setSupportsPainting
(
false
);
setShowConfigurationWidget
(
false
);
...
...
@@ -99,7 +100,7 @@ KisEmbossLaplascianFilter::KisEmbossLaplascianFilter()
}
KisEmbossInAllDirectionsFilter
::
KisEmbossInAllDirectionsFilter
()
:
KisConvolutionFilter
(
id
(),
categoryEmboss
()
,
i18n
(
"Emboss in All Directions"
))
:
KisConvolutionFilter
(
id
(),
FiltersCategoryEmbossId
,
i18n
(
"Emboss in All Directions"
))
{
setSupportsPainting
(
false
);
setShowConfigurationWidget
(
false
);
...
...
@@ -114,7 +115,7 @@ KisEmbossInAllDirectionsFilter::KisEmbossInAllDirectionsFilter()
}
KisEmbossHorizontalVerticalFilter
::
KisEmbossHorizontalVerticalFilter
()
:
KisConvolutionFilter
(
id
(),
categoryEmboss
()
,
i18n
(
"Emboss Horizontal && Vertical"
))
:
KisConvolutionFilter
(
id
(),
FiltersCategoryEmbossId
,
i18n
(
"Emboss Horizontal && Vertical"
))
{
setSupportsPainting
(
false
);
setShowConfigurationWidget
(
false
);
...
...
@@ -129,7 +130,7 @@ KisEmbossHorizontalVerticalFilter::KisEmbossHorizontalVerticalFilter()
}
KisEmbossVerticalFilter
::
KisEmbossVerticalFilter
()
:
KisConvolutionFilter
(
id
(),
categoryEmboss
()
,
i18n
(
"Emboss Vertical Only"
))
:
KisConvolutionFilter
(
id
(),
FiltersCategoryEmbossId
,
i18n
(
"Emboss Vertical Only"
))
{
setSupportsPainting
(
false
);
setShowConfigurationWidget
(
false
);
...
...
@@ -144,7 +145,7 @@ KisEmbossVerticalFilter::KisEmbossVerticalFilter()
}
KisEmbossHorizontalFilter
::
KisEmbossHorizontalFilter
()
:
KisConvolutionFilter
(
id
(),
categoryEmboss
()
,
i18n
(
"Emboss Horizontal Only"
))
KisConvolutionFilter
(
id
(),
FiltersCategoryEmbossId
,
i18n
(
"Emboss Horizontal Only"
))
{
setSupportsPainting
(
false
);
setShowConfigurationWidget
(
false
);
...
...
@@ -159,7 +160,7 @@ KisEmbossHorizontalFilter::KisEmbossHorizontalFilter() :
}
KisEmbossDiagonalFilter
::
KisEmbossDiagonalFilter
()
:
KisConvolutionFilter
(
id
(),
categoryEdgeDetection
()
,
i18n
(
"Top Edge Detection"
))
:
KisConvolutionFilter
(
id
(),
FiltersCategoryEdgeDetectionId
,
i18n
(
"Top Edge Detection"
))
{
setSupportsPainting
(
false
);
setShowConfigurationWidget
(
false
);
...
...
plugins/filters/dodgeburn/DodgeBurn.cpp
View file @
08968e7b
...
...
@@ -16,12 +16,13 @@
*/
#include "DodgeBurn.h"
#include <filter/kis_filter_category_ids.h>
#include <filter/kis_color_transformation_configuration.h>
#include <kis_paint_device.h>
#include "ui_DodgeBurnConfigurationBaseWidget.h"
KisFilterDodgeBurn
::
KisFilterDodgeBurn
(
const
QString
&
id
,
const
QString
&
prefix
,
const
QString
&
name
)
:
KisColorTransformationFilter
(
KoID
(
id
,
name
),
categoryAdjust
()
,
name
),
m_prefix
(
prefix
)
KisFilterDodgeBurn
::
KisFilterDodgeBurn
(
const
QString
&
id
,
const
QString
&
prefix
,
const
QString
&
name
)
:
KisColorTransformationFilter
(
KoID
(
id
,
name
),
FiltersCategoryAdjustId
,
name
),
m_prefix
(
prefix
)
{
setColorSpaceIndependence
(
FULLY_INDEPENDENT
);
setSupportsPainting
(
true
);
...
...
plugins/filters/edgedetection/kis_edge_detection_filter.cpp
View file @
08968e7b
...
...
@@ -24,6 +24,7 @@
#include <KoColorSpaceRegistry.h>
#include <KoColorModelStandardIds.h>
#include <filter/kis_filter_category_ids.h>
#include <filter/kis_filter_configuration.h>
#include <kis_selection.h>
#include <kis_paint_device.h>
...
...
@@ -47,7 +48,7 @@ KritaEdgeDetectionFilter::~KritaEdgeDetectionFilter()
{
}
KisEdgeDetectionFilter
::
KisEdgeDetectionFilter
()
:
KisFilter
(
id
(),
categoryEdgeDetection
()
,
i18n
(
"&Edge Detection..."
))
KisEdgeDetectionFilter
::
KisEdgeDetectionFilter
()
:
KisFilter
(
id
(),
FiltersCategoryEdgeDetectionId
,
i18n
(
"&Edge Detection..."
))
{
setSupportsPainting
(
true
);
setSupportsAdjustmentLayers
(
true
);
...
...
plugins/filters/embossfilter/kis_emboss_filter.cpp
View file @
08968e7b
...
...
@@ -43,6 +43,7 @@
#include <kis_global.h>
#include <kis_selection.h>
#include <kis_types.h>
#include <filter/kis_filter_category_ids.h>
#include <filter/kis_filter_configuration.h>
#include <kis_paint_device.h>
#include <kis_processing_information.h>
...
...
@@ -51,7 +52,7 @@
#include <KisSequentialIteratorProgress.h>
KisEmbossFilter
::
KisEmbossFilter
()
:
KisFilter
(
id
(),
categoryEmboss
()
,
i18n
(
"&Emboss with Variable Depth..."
))
KisEmbossFilter
::
KisEmbossFilter
()
:
KisFilter
(
id
(),
FiltersCategoryEmbossId
,
i18n
(
"&Emboss with Variable Depth..."
))
{
setSupportsPainting
(
false
);
setColorSpaceIndependence
(
TO_RGBA8
);
...
...
plugins/filters/example/example.cpp
View file @
08968e7b
...
...
@@ -33,6 +33,7 @@
#include <kis_types.h>
#include <kis_selection.h>
#include <kis_layer.h>
#include <filter/kis_filter_category_ids.h>
#include <filter/kis_filter_registry.h>
#include <kis_global.h>
#include "KoColorModelStandardIds.h"
...
...
@@ -49,7 +50,7 @@ KritaExample::~KritaExample()
{
}
KisFilterInvert
::
KisFilterInvert
()
:
KisColorTransformationFilter
(
id
(),
categoryAdjust
()
,
i18n
(
"&Invert"
))
KisFilterInvert
::
KisFilterInvert
()
:
KisColorTransformationFilter
(
id
(),
FiltersCategoryAdjustId
,
i18n
(
"&Invert"
))
{
setShortcut
(
QKeySequence
(
Qt
::
CTRL
+
Qt
::
Key_I
));
setColorSpaceIndependence
(
FULLY_INDEPENDENT
);
...
...
plugins/filters/fastcolortransfer/fastcolortransfer.cpp
View file @
08968e7b
...
...
@@ -33,6 +33,7 @@
#include <kis_image.h>
#include <kis_paint_device.h>
#include <kis_selection.h>
#include <filter/kis_filter_category_ids.h>
#include <filter/kis_filter_configuration.h>
#include <kis_processing_information.h>
...
...
@@ -56,7 +57,7 @@ FastColorTransferPlugin::~FastColorTransferPlugin()
{
}
KisFilterFastColorTransfer
::
KisFilterFastColorTransfer
()
:
KisFilter
(
id
(),
categoryColors
()
,
i18n
(
"&Color Transfer..."
))
KisFilterFastColorTransfer
::
KisFilterFastColorTransfer
()
:
KisFilter
(
id
(),
FiltersCategoryColorId
,
i18n
(
"&Color Transfer..."
))
{
setColorSpaceIndependence
(
FULLY_INDEPENDENT
);
setSupportsThreading
(
false
);
...
...
plugins/filters/gradientmap/krita_filter_gradient_map.cpp
View file @
08968e7b
...
...
@@ -25,6 +25,7 @@
#include <kis_global.h>
#include <kis_types.h>
#include <filter/kis_filter_category_ids.h>
#include "kis_config_widget.h"
#include <KoResourceServerProvider.h>
#include <KoResourceServer.h>
...
...
@@ -36,7 +37,7 @@
#include <KisSequentialIteratorProgress.h>
KritaFilterGradientMap
::
KritaFilterGradientMap
()
:
KisFilter
(
id
(),
categoryMap
()
,
i18n
(
"&Gradient Map..."
))
KritaFilterGradientMap
::
KritaFilterGradientMap
()
:
KisFilter
(
id
(),
FiltersCategoryMapId
,
i18n
(
"&Gradient Map..."
))
{
setColorSpaceIndependence
(
FULLY_INDEPENDENT
);
setShowConfigurationWidget
(
true
);
...
...
plugins/filters/halftone/kis_halftone_filter.cpp
View file @
08968e7b
...
...
@@ -26,6 +26,7 @@
#include <KoUpdater.h>
#include <KoCompositeOps.h>
#include <filter/kis_filter_category_ids.h>
#include "kis_filter_configuration.h"
#include <kis_filter_registry.h>
...
...
@@ -51,7 +52,7 @@ KritaHalftone::~KritaHalftone()
}
KisHalftoneFilter
::
KisHalftoneFilter
()
:
KisFilter
(
id
(),
categoryArtistic
()
,
i18n
(
"&Halftone..."
))
:
KisFilter
(
id
(),
FiltersCategoryArtisticId
,
i18n
(
"&Halftone..."
))
{
setColorSpaceIndependence
(
FULLY_INDEPENDENT
);
...
...
plugins/filters/imageenhancement/kis_simple_noise_reducer.cpp
View file @
08968e7b
...
...
@@ -30,6 +30,7 @@
#include <kis_convolution_painter.h>
#include <kis_global.h>
#include <widgets/kis_multi_integer_filter_widget.h>
#include <filter/kis_filter_category_ids.h>
#include <filter/kis_filter_configuration.h>
#include <kis_processing_information.h>
#include <kis_paint_device.h>
...
...
@@ -38,7 +39,7 @@
KisSimpleNoiseReducer
::
KisSimpleNoiseReducer
()
:
KisFilter
(
id
(),
categoryEnhance
()
,
i18n
(
"&Gaussian Noise Reduction..."
))
:
KisFilter
(
id
(),
FiltersCategoryEnhanceId
,
i18n
(
"&Gaussian Noise Reduction..."
))
{
setSupportsPainting
(
false
);
}
...
...
plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp
View file @
08968e7b
...
...
@@ -29,12 +29,13 @@
#include <widgets/kis_multi_double_filter_widget.h>
#include <widgets/kis_multi_integer_filter_widget.h>
#include <kis_paint_device.h>