Commit 2b06cb88 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Move our custom widgets into their own directory

svn path=/trunk/koffice/; revision=797579
parent 5237aff0
......@@ -55,12 +55,12 @@ const KisNodeSP KisNodeFacade::root() const
bool KisNodeFacade::moveNode(KisNodeSP node, KisNodeSP parent, KisNodeSP aboveThis)
{
if ( !node ) { dbgImage << "can't move null node"; return false; }
if ( !parent ) { dbgImage << "can't move to null parent"; return false; }
if ( node == parent ) { dbgImage << "can't move self inside self"; return false; }
if ( node == aboveThis ) { dbgImage << "can't move self above self"; return false; }
if ( parent == aboveThis ) { dbgImage << "can't move above parent"; return false; }
if ( !node->parent() ) { dbgImage << "node doesn't have a parent"; return false; }
if ( !node ) { dbgImage << "cannot move null node"; return false; }
if ( !parent ) { dbgImage << "cannot move to null parent"; return false; }
if ( node == parent ) { dbgImage << "cannot move self inside self"; return false; }
if ( node == aboveThis ) { dbgImage << "cannot move self above self"; return false; }
if ( parent == aboveThis ) { dbgImage << "cannot move above parent"; return false; }
if ( !node->parent() ) { dbgImage << "node does not have a parent"; return false; }
if ( aboveThis && aboveThis->parent() != parent ) { dbgImage << "above this parent is not the parent"; return false; }
......
......@@ -26,7 +26,7 @@
#include "kis_types.h"
#include "kis_effect_mask.h"
#include <kis_filter_strategy.h>
#include <kis_cmb_idlist.h>
#include <widgets/kis_cmb_idlist.h>
class KisFilterStrategy;
......
......@@ -328,4 +328,5 @@ void KisTileStoreMemory::reclaimTileToPool(quint8* data, qint32 pixelSize) {
}
}
}
#endif
\ No newline at end of file
#endif
......@@ -46,7 +46,7 @@
#include "kis_paint_device.h"
#include "kis_iterators_pixel.h"
#include "kis_iterator.h"
#include "kcurve.h"
#include "widgets/kcurve.h"
#include "kis_histogram.h"
#include "kis_painter.h"
......
......@@ -44,7 +44,7 @@
#include <kis_processing_information.h>
#include "kis_iterators_pixel.h"
#include "kcurve.h"
#include "widgets/kcurve.h"
#include "kis_histogram.h"
#include "kis_painter.h"
......
......@@ -254,7 +254,7 @@
<customwidget>
<class>KCurve</class>
<extends></extends>
<header>kcurve.h</header>
<header>widgets/kcurve.h</header>
<container>0</container>
<pixmap></pixmap>
</customwidget>
......
......@@ -155,7 +155,7 @@
<customwidget>
<class>KCurve</class>
<extends></extends>
<header>kcurve.h</header>
<header>widgets/kcurve.h</header>
<container>0</container>
<pixmap></pixmap>
</customwidget>
......
......@@ -55,7 +55,7 @@
#include <kis_processing_information.h>
#include <KoCompositeOp.h>
#include "kis_multi_integer_filter_widget.h"
#include "widgets/kis_multi_integer_filter_widget.h"
#include "kis_polygon.h"
......
......@@ -52,7 +52,7 @@
#include <kis_paint_device.h>
#include <kis_processing_information.h>
#include "kis_multi_integer_filter_widget.h"
#include "widgets/kis_multi_integer_filter_widget.h"
KisEmbossFilter::KisEmbossFilter() : KisFilter(id(), CategoryEmboss, i18n("&Emboss with Variable Depth..."))
{
......
......@@ -28,7 +28,7 @@
#include <kis_convolution_kernel.h>
#include <kis_convolution_painter.h>
#include <kis_global.h>
#include <kis_multi_integer_filter_widget.h>
#include <widgets/kis_multi_integer_filter_widget.h>
#include <filter/kis_filter_configuration.h>
#include <kis_processing_information.h>
#include <kis_paint_device.h>
......
......@@ -27,8 +27,8 @@
#include <kis_iterators_pixel.h>
#include <kis_layer.h>
#include <kis_math_toolbox.h>
#include <kis_multi_double_filter_widget.h>
#include <kis_multi_integer_filter_widget.h>
#include <widgets/kis_multi_double_filter_widget.h>
#include <widgets/kis_multi_integer_filter_widget.h>
#include <kis_paint_device.h>
#include <filter/kis_filter_configuration.h>
#include <kis_processing_information.h>
......
......@@ -52,7 +52,7 @@
#include <kis_processing_information.h>
#include <kis_paint_device.h>
#include "kis_multi_integer_filter_widget.h"
#include "widgets/kis_multi_integer_filter_widget.h"
KisOilPaintFilter::KisOilPaintFilter() : KisFilter( id(), KisFilter::CategoryArtistic, i18n("&Oilpaint...") )
......
......@@ -53,7 +53,7 @@
#include <filter/kis_filter_configuration.h>
#include <kis_processing_information.h>
#include "kis_multi_integer_filter_widget.h"
#include "widgets/kis_multi_integer_filter_widget.h"
KisPixelizeFilter::KisPixelizeFilter() : KisFilter(id(), KisFilter::CategoryArtistic, i18n("&Pixelize..."))
......
......@@ -52,7 +52,7 @@
#include <filter/kis_filter_configuration.h>
#include <kis_processing_information.h>
#include "kis_multi_integer_filter_widget.h"
#include "widgets/kis_multi_integer_filter_widget.h"
KisRainDropsFilter::KisRainDropsFilter() : KisFilter(id(), KisFilter::CategoryArtistic, i18n("&Raindrops..."))
......
......@@ -42,7 +42,7 @@
#include <kis_image.h>
#include <kis_iterators_pixel.h>
#include <kis_layer.h>
#include <kis_multi_integer_filter_widget.h>
#include <widgets/kis_multi_integer_filter_widget.h>
#include <kis_selection.h>
#include <filter/kis_filter_configuration.h>
#include <kis_processing_information.h>
......
......@@ -53,7 +53,7 @@
#include <kis_processing_information.h>
#include <KoCompositeOp.h>
#include "kis_multi_integer_filter_widget.h"
#include "widgets/kis_multi_integer_filter_widget.h"
KisSmallTilesFilter::KisSmallTilesFilter() : KisFilter(id(), KisFilter::CategoryMap, i18n("&Small Tiles..."))
{
......
......@@ -52,7 +52,7 @@
#include <filter/kis_filter_configuration.h>
#include <kis_processing_information.h>
#include "kis_multi_bool_filter_widget.h"
#include "widgets/kis_multi_bool_filter_widget.h"
#define MIN(a,b) (((a)<(b))?(a):(b))
......
......@@ -39,7 +39,7 @@
#include <KoColor.h>
#include <KoInputDevice.h>
#include <kcurve.h>
#include <widgets/kcurve.h>
#include <kis_brush.h>
#include <kis_brushop.h>
#include <kis_datamanager.h>
......
......@@ -35,7 +35,7 @@
#include <KoInputDevice.h>
#include <KoColorSpaceRegistry.h>
#include <kcurve.h>
#include <widgets/kcurve.h>
#include <kis_brush.h>
#include <kis_global.h>
#include <kis_paint_device.h>
......
......@@ -192,7 +192,7 @@
<customwidgets>
<customwidget>
<class>KCurve</class>
<header location="local" >kcurve.h</header>
<header location="local" >widgets/kcurve.h</header>
<sizehint>
<width>-1</width>
<height>-1</height>
......@@ -211,9 +211,9 @@
</image>
</images>
<includes>
<include location="local" >kcurve.h</include>
<include location="local" >kcurve.h</include>
<include location="local" >kcurve.h</include>
<include location="local" >widgets/kcurve.h</include>
<include location="local" >widgets/kcurve.h</include>
<include location="local" >widgets/kcurve.h</include>
</includes>
<connections>
<connection>
......
......@@ -116,7 +116,7 @@
<customwidget>
<class>KisCmbIDList</class>
<extends>QComboBox</extends>
<header>kis_cmb_idlist.h</header>
<header>widgets/kis_cmb_idlist.h</header>
</customwidget>
</customwidgets>
<resources/>
......
......@@ -22,7 +22,7 @@
<customwidget>
<class>KisCmbIDList</class>
<extends>QComboBox</extends>
<header>kis_cmb_idlist.h</header>
<header>widgets/kis_cmb_idlist.h</header>
</customwidget>
</customwidgets>
<resources/>
......
......@@ -209,7 +209,7 @@
<customwidget>
<class>KisCmbIDList</class>
<extends>QComboBox</extends>
<header>kis_cmb_idlist.h</header>
<header>widgets/kis_cmb_idlist.h</header>
</customwidget>
</customwidgets>
<resources/>
......
......@@ -53,12 +53,12 @@
<customwidget>
<class>KisCmbIDList</class>
<extends>QComboBox</extends>
<header>kis_cmb_idlist.h</header>
<header>widgets/kis_cmb_idlist.h</header>
</customwidget>
<customwidget>
<class>KisPopupButton</class>
<extends>QPushButton</extends>
<header>kis_popup_button.h</header>
<header>widgets/kis_popup_button.h</header>
</customwidget>
</customwidgets>
<resources/>
......
......@@ -206,7 +206,7 @@ void KisToolColorPicker::displayPickedColor()
int pos = channels[i]->pos() / channels[i]->size(); // HACK This doesn't work if the channels differ in size
if (m_normaliseValues) {
channelValueText = i18n("%1%").arg(m_pickedColor.colorSpace()->normalisedChannelValueText(m_pickedColor.data(), pos));
channelValueText = m_pickedColor.colorSpace()->normalisedChannelValueText(m_pickedColor.data(), pos);
} else {
channelValueText = m_pickedColor.colorSpace()->channelValueText(m_pickedColor.data(), pos);
}
......
......@@ -38,7 +38,7 @@
#include "kis_cursor.h"
#include "kis_painter.h"
#include "kis_tool_brush.h"
#include "kis_cmb_composite.h"
#include "widgets/kis_cmb_composite.h"
#include "KoColorSpace.h"
#include "KoCanvasBase.h"
......
......@@ -43,9 +43,9 @@
#include "KoCanvasBase.h"
#include "KoViewConverter.h"
#include "kis_cmb_composite.h"
#include "widgets/kis_cmb_composite.h"
#include "kis_cursor.h"
#include "kis_double_widget.h"
#include "widgets/kis_double_widget.h"
#include "kis_gradient_painter.h"
#include "kis_painter.h"
#include "KoProgressUpdater.h"
......
......@@ -34,7 +34,7 @@
#include "KoPointerEvent.h"
#include "kis_brush.h"
#include "kis_cmb_composite.h"
#include "widgets/kis_cmb_composite.h"
#include "kis_cursor.h"
#include "kis_doc2.h"
#include "kis_paintop.h"
......
......@@ -34,7 +34,7 @@
#include <kiconloader.h>
#include <kactioncollection.h>
#include "kis_cmb_composite.h"
#include "widgets/kis_cmb_composite.h"
#include "kis_config.h"
#include "kis_cursor.h"
//#include "kis_doc2.h"
......
......@@ -36,7 +36,7 @@
#include <kiconloader.h>
#include <kactioncollection.h>
#include "kis_cmb_composite.h"
#include "widgets/kis_cmb_composite.h"
#include "kis_config.h"
#include "kis_cursor.h"
//#include "kis_doc2.h"
......
......@@ -52,7 +52,7 @@
#include <KoPointerEvent.h>
#include <kis_selection.h>
#include <kis_filter_strategy.h>
#include <kis_cmb_idlist.h>
#include <widgets/kis_cmb_idlist.h>
#include <kis_perspectivetransform_worker.h>
......
......@@ -52,7 +52,7 @@
#include <kis_selected_transaction.h>
#include <kis_selection.h>
#include <kis_filter_strategy.h>
#include <kis_cmb_idlist.h>
#include <widgets/kis_cmb_idlist.h>
#include <kis_transform_worker.h>
#include "kis_layer_shape.h"
......
......@@ -176,7 +176,7 @@
<customwidget>
<class>KisCmbIDList</class>
<extends>QComboBox</extends>
<header location="local" >kis_cmb_idlist.h</header>
<header location="local" >widgets/kis_cmb_idlist.h</header>
<sizehint>
<width>1</width>
<height>24</height>
......
......@@ -501,14 +501,14 @@ void Bracketing2HDRPlugin::computeCameraResponse(QList<BracketingFrame> frames)
for(int i = 0; i < numberOfInputLevels(); i ++ )
{
redCurve->addPoint(i, m_intensityR[i]);
min = QMIN(min, m_intensityR[i]);
max = QMAX(max, m_intensityR[i]);
min = qMin(min, m_intensityR[i]);
max = qMax(max, m_intensityR[i]);
greenCurve->addPoint(i, m_intensityG[i]);
min = QMIN(min, m_intensityG[i]);
max = QMAX(max, m_intensityG[i]);
min = qMin(min, m_intensityG[i]);
max = qMax(max, m_intensityG[i]);
blueCurve->addPoint(i, m_intensityB[i]);
min = QMIN(min, m_intensityB[i]);
max = QMAX(max, m_intensityB[i]);
min = qMin(min, m_intensityB[i]);
max = qMax(max, m_intensityB[i]);
// dbgPlugins << i <<"" << m_intensityR[i] <<"" << m_intensityG[i] <<"" << m_intensityB[i];
}
m_wdgBracketing2HDR->plotWidget->addPlotObject(redCurve);
......
......@@ -51,8 +51,8 @@
#include "kis_view2.h"
#include "kis_paint_device.h"
#include "kis_cmb_idlist.h"
#include "squeezedcombobox.h"
#include "widgets/kis_cmb_idlist.h"
#include "widgets/squeezedcombobox.h"
#include "dlg_colorspaceconversion.h"
......
......@@ -35,8 +35,8 @@
#include "KoColorSpace.h"
#include "KoID.h"
#include "kis_cmb_idlist.h"
#include "squeezedcombobox.h"// TODO: add a label that would display if there isn't a good color conversion path (use KoColorConversionSystem::isGoodPath), all color spaces shiped with KOffice are expected to have a good path, but better warn the user in case
#include "widgets/kis_cmb_idlist.h"
#include "widgets/squeezedcombobox.h"// TODO: add a label that would display if there isn't a good color conversion path (use KoColorConversionSystem::isGoodPath), all color spaces shiped with KOffice are expected to have a good path, but better warn the user in case
DlgColorSpaceConversion::DlgColorSpaceConversion( QWidget * parent,
const char * name)
......
......@@ -163,7 +163,7 @@ colors (Pantone, TruMatch, logo colors, ...)</string>
<customwidget>
<class>KisCmbIDList</class>
<extends></extends>
<header location="local" >kis_cmb_idlist.h</header>
<header location="local" >widgets/kis_cmb_idlist.h</header>
<sizehint>
<width>1</width>
<height>24</height>
......@@ -178,7 +178,7 @@ colors (Pantone, TruMatch, logo colors, ...)</string>
<customwidget>
<class>SqueezedComboBox</class>
<extends></extends>
<header location="local" >squeezedcombobox.h</header>
<header location="local" >widgets/squeezedcombobox.h</header>
<sizehint>
<width>-1</width>
<height>0</height>
......
......@@ -27,7 +27,7 @@
#include <KoUnit.h>
#include <kis_cmb_idlist.h>
#include <widgets/kis_cmb_idlist.h>
#include <kis_filter_strategy.h>// XXX: I'm really real bad at arithmetic, let alone math. Here
// be rounding errors. (Boudewijn)
DlgImageSize::DlgImageSize(QWidget *parent, int width, int height, double resolution)
......
......@@ -26,7 +26,7 @@
#include <klocale.h>
#include <kis_debug.h>
#include <kis_cmb_idlist.h>
#include <widgets/kis_cmb_idlist.h>
#include <kis_filter_strategy.h>// XXX: I'm really real bad at arithmetic, let alone math. Here
// be rounding errors. (Boudewijn)
DlgLayerSize::DlgLayerSize( QWidget * parent,
......
......@@ -333,7 +333,7 @@
<customwidget>
<class>KisCmbIDList</class>
<extends></extends>
<header>kis_cmb_idlist.h</header>
<header>widgets/kis_cmb_idlist.h</header>
</customwidget>
</customwidgets>
<resources/>
......
......@@ -293,7 +293,7 @@
<customwidget>
<class>KisCmbIDList</class>
<extends></extends>
<header location="local" >kis_cmb_idlist.h</header>
<header location="local" >widgets/kis_cmb_idlist.h</header>
<sizehint>
<width>1</width>
<height>24</height>
......
......@@ -181,7 +181,7 @@
<customwidget>
<class>KisCmbIDList</class>
<extends></extends>
<header location="local" >kis_cmb_idlist.h</header>
<header location="local" >widgets/kis_cmb_idlist.h</header>
<sizehint>
<width>1</width>
<height>24</height>
......
......@@ -47,7 +47,7 @@
#include "kis_paint_device.h"
#include "kis_types.h"
#include "kis_view2.h"
#include "imageviewer.h"
#include "widgets/imageviewer.h"
#include <kis_image.h>
#include "imagoptim_functions.h"
......
......@@ -188,7 +188,7 @@
<customwidget>
<class>ImageViewer</class>
<extends>QWidget</extends>
<header>imageviewer.h</header>
<header>widgets/imageviewer.h</header>
<container>1</container>
</customwidget>
</customwidgets>
......
......@@ -158,7 +158,7 @@ void KisChannelSeparator::separate(KoUpdater * progressUpdater, enumSepAlphaOpti
// To grayscale
// Decide wether we need downscaling
// Decide whether we need downscaling
if (channelSize == 1 && destSize == 1) {
// Both 8-bit channels
......
......@@ -8,125 +8,123 @@ configure_file(config-processor.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-proce
include(kdefx.cmake)
set(kritaui_LIB_SRCS
imageviewer.cc
kcurve.cc
kis_abstract_canvas_widget.cpp
kis_auto_brush_widget.cpp
dialogs/kis_dlg_adj_layer_props.cc
dialogs/kis_dlg_adjustment_layer.cc
dialogs/kis_dlg_apply_profile.cc
dialogs/kis_dlg_filter.cpp
dialogs/kis_dlg_generator_layer.cpp
dialogs/kis_dlg_image_properties.cc
dialogs/kis_dlg_layer_properties.cc
dialogs/kis_dlg_new_layer.cc
dialogs/kis_dlg_preferences.cc
dialogs/kis_dlg_transformation_effect.cpp
kis_abstract_canvas_widget.cpp
kis_autogradient.cc
kis_birdeye_box.cc
kis_birdeye_box.cc
kis_bookmarked_configurations_editor.cc
kis_bookmarked_configurations_model.cc
kis_bookmarked_filter_configurations_model.cc
kis_boundary_painter.cc
kis_brush_chooser.cc
kis_canvas2.cpp
kis_boundary_painter.cc
kis_canvas2.cpp
kis_canvas_decoration.cc
kis_canvas_resource_provider.cpp
kis_channelflags_widget.cpp
kis_clipboard.cc
kis_cmb_composite.cc
kis_cmb_idlist.cc
kis_color_space_selector.cc
kis_canvas_resource_provider.cpp
kis_clipboard.cc
kis_config.cc
kis_config_notifier.cpp
kis_control_frame.cpp
kis_config_notifier.cpp
kis_control_frame.cpp
kis_cursor.cc
kis_custom_brush.cc
kis_custom_image_widget.cc
kis_custom_palette.cc
kis_custom_brush.cc
kis_custom_palette.cc
kis_custom_pattern.cc
dialogs/kis_dlg_adj_layer_props.cc
dialogs/kis_dlg_adjustment_layer.cc
dialogs/kis_dlg_apply_profile.cc
dialogs/kis_dlg_image_properties.cc
dialogs/kis_dlg_layer_properties.cc
dialogs/kis_dlg_new_layer.cc
dialogs/kis_dlg_preferences.cc
dialogs/kis_dlg_transformation_effect.cpp
kis_doc2.cc
kis_double_widget.cc
kis_exposure_visitor.cc
kis_doc2.cc
kis_exposure_visitor.cc
kis_factory2.cc
dialogs/kis_dlg_filter.cpp
kis_filter_handler.cc
kis_filter_manager.cc
kis_filter_handler.cc
kis_filter_manager.cc
kis_filters_model.cc
kis_gradient_chooser.cc
kis_gradient_slider_widget.cc
kis_grid_manager.cpp
kis_grid_manager.cpp
kis_grid_painter_configuration.cpp
kis_histogram_view.cc
kis_icon_item.cc
kis_iconwidget.cc
kis_histogram_view.cc
kis_icon_item.cc
kis_image_manager.cc
kis_imagepipe_brush.cc
kis_imagepipe_brush.cc
kis_image_view_converter.cpp
kis_import_catcher.cc
kis_itemchooser.cc
kis_kra_loader.cpp
kis_import_catcher.cc
kis_kra_loader.cpp
kis_kra_load_visitor.cpp
kis_kra_save_visitor.cpp
kis_kra_save_