Commit 6396159f authored by Brijesh Patel's avatar Brijesh Patel

renumbering fixed

parent dc82f325
......@@ -232,6 +232,23 @@ if( Soprano_FOUND )
endif( Soprano_FOUND )
##
## Test for marble
##
macro_optional_find_package(Marble)
macro_log_feature(MARBLE_FOUND "Marble" "KDE4 World Globe Widget" "http://techbase.kde.org/Projects/Marble/" FALSE "" "Required to show locations on a map")
if(NOT MARBLE_FOUND)
set(CAN_USE_MARBLE FALSE)
set(MARBLE_INCLUDE_DIR "")
else(NOT MARBLE_FOUND)
set(CAN_USE_MARBLE TRUE)
endif(NOT MARBLE_FOUND)
if( MARBLE_FOUND )
add_definitions( -DCAN_USE_MARBLE )
endif( MARBLE_FOUND )
##
## Test for lcms
##
......@@ -379,6 +396,7 @@ set(TEXTLAYOUT_INCLUDES ${KOTEXT_INCLUDES}
# komain depends on kotext & flake
set(KOMAIN_INCLUDES ${KDE4_INCLUDES}
${TEXTLAYOUT_INCLUDES}
${MARBLE_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/libs/widgets
${CMAKE_SOURCE_DIR}/libs/main
${CMAKE_SOURCE_DIR}/libs/main/rdf
......
......@@ -11,3 +11,4 @@ set(CTEST_DROP_METHOD "http")
set(CTEST_DROP_SITE "my.cdash.org")
set(CTEST_DROP_LOCATION "/submit.php?project=calligra")
set(CTEST_DROP_SITE_CDASH TRUE)
set(CTEST_PROJECT_SUBPROJECTS cstester)
# - Try to find the Marble Library
# Once done this will define
#
# MARBLE_FOUND - system has Marble
# MARBLE_INCLUDE_DIR - the Marble include directory
# MARBLE_LIBRARIES
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
if ( MARBLE_INCLUDE_DIR AND MARBLE_LIBRARIES )
# in cache already
SET( MARBLE_FIND_QUIETLY TRUE )
endif ( MARBLE_INCLUDE_DIR AND MARBLE_LIBRARIES )
FIND_PATH( MARBLE_INCLUDE_DIR NAMES MarbleMap.h PATH_SUFFIXES marble
)
FIND_LIBRARY( MARBLE_LIBRARIES NAMES marblewidget )
include( FindPackageHandleStandardArgs )
FIND_PACKAGE_HANDLE_STANDARD_ARGS( marble DEFAULT_MSG MARBLE_INCLUDE_DIR MARBLE_LIBRARIES )
......@@ -25,7 +25,8 @@ Comment[kk]=Krita-ның қылқалам плагині
Comment[lv]=Krita otas filtra spraudnis
Comment[nb]=Pensel-programtillegg for Krita
Comment[nds]=Pinselmoduul för Krita
Comment[nl]=Penseelplugin voor Krita
Comment[nl]=Penseelplug-in voor Krita
Comment[pl]=Wtyczka pędzla dla Krita
Comment[pt]='Plugin' de pincéis do Krita
Comment[pt_BR]=Plug-in de pincéis do Krita
Comment[sv]=Insticksprogram med pensel för Krita
......
......@@ -2,6 +2,7 @@
Type=ServiceType
X-KDE-ServiceType=Krita/Dock
Comment=Docker for Krita
Comment[bg]=Контейнер за Krita
Comment[ca]=Amarrador per al Krita
Comment[ca@valencia]=Amarrador per al Krita
Comment[da]=Docker til Krita
......@@ -21,6 +22,7 @@ Comment[lv]=Krita doka spraudnis
Comment[nb]=Dokker for Krita
Comment[nds]=Andockmoduul för Krita
Comment[nl]=Vastzetten van Krita
Comment[pl]=Dokowanie dla Krita
Comment[pt]=Acoplador para o Krita
Comment[pt_BR]=Acoplador para o Krita
Comment[sv]=Dockningsfönster för Krita
......
......@@ -32,7 +32,7 @@ Comment[ms]=Plugin penapis Krita
Comment[nb]=Filter-programtillegg for Krita
Comment[nds]=Filtermoduul för Krita
Comment[ne]=क्रिताका लागि फिल्टर प्लगइन
Comment[nl]=Filterplugin voor Krita
Comment[nl]=Filterplug-in voor Krita
Comment[pl]=Wtyczka filtrów dla Krita
Comment[pt]='Plugin' de filtragem do Krita
Comment[pt_BR]=Plug-in de filtragem do Krita
......
......@@ -21,7 +21,8 @@ Comment[kk]=Krita-ның қабат дерегін жасау плагині
Comment[lv]=Krita slāņa datu ģeneratora spraudnis
Comment[nb]=Krita-programtillegg for lagdata-generator
Comment[nds]=Laagdatenmaker-Moduul för Krita
Comment[nl]=Laaggegevensgeneratorplugin voor Krita
Comment[nl]=Laaggegevensgeneratorplug-in voor Krita
Comment[pl]=Wtyczka generatora danych warstwy dla Krita
Comment[pt]='Plugin' de geração de dados para camadas no Krita
Comment[pt_BR]=Plug-in de geração de dados para camadas no Krita
Comment[sv]=Insticksprogram med generering av lagerdata för Krita
......
......@@ -29,7 +29,7 @@ Comment[lv]=Krita zīmēšanas darbības spraudnis
Comment[nb]=Krita-programtillegg for male-handlinger
Comment[nds]=Maalmoduul för Krita
Comment[ne]=क्रिताका लागि पेन्ट सञ्चालन प्लगइन
Comment[nl]=Verfverrichtingplugin voor Krita
Comment[nl]=Verfverrichtingplug-in voor Krita
Comment[pl]=Wtyczka operacji malowania dla Krita
Comment[pt]='Plugin' de operações de pintura do Krita
Comment[pt_BR]=Plug-in de operações de pintura do Krita
......
......@@ -32,7 +32,7 @@ Comment[ms]=Plugin alat Krita
Comment[nb]=Krita-programtillegg for verktøy
Comment[nds]=Warktüüchmoduul för Krita
Comment[ne]=क्रिताका लागि उपकरण प्लगइन
Comment[nl]=Gereedschapsplugin voor Krita
Comment[nl]=Gereedschapsplug-in voor Krita
Comment[pl]=Wtyczka narzędzi dla Krita
Comment[pt]='Plugin' de ferramentas do Krita
Comment[pt_BR]=Plug-in de ferramentas do Krita
......
......@@ -9,7 +9,7 @@ StatusOfTheseToolDockers=KisRulerAssistantTool Option Widget,KisToolTransform op
[krita]
State=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
DockerPluginsDisabled=kritapainterlymixer
[DockWidget DefaultToolArrangeWidget]
Collapsed=false
......
......@@ -12,7 +12,6 @@ install(FILES
NTSC.icm
PAL.icm
SMPTE-C.icm
srgb_color_space_profile.icm
sRGB.icm
scRGB.icm
srgbspac.icm
......
This diff is collapsed.
......@@ -14,6 +14,7 @@ Name[kk]=Комикс үлгілері
Name[nb]=Tegneseriemaler
Name[nds]=Comic-Vörlagen
Name[nl]=Stripverhaalsjabloon
Name[pl]=Szablony komiksów
Name[pt]=Modelos de Banda Desenhada
Name[pt_BR]=Modelos de quadrinhos
Name[sv]=Seriemallar
......
......@@ -16,6 +16,7 @@ Name[kk]=Еуропалық BD үлгісі
Name[nb]=Europeisk BD-mal
Name[nds]=Europääsch BD-Vörlaag
Name[nl]=Europees BD-sjabloon
Name[pl]=Europejski szablon BD
Name[pt]=Modelo de BD europeu
Name[pt_BR]=Modelo Europeu BD
Name[sv]=Europeisk BD-mall
......@@ -37,6 +38,7 @@ Comment[kk]=Еуропалық BD-стильдегі комикс үлгісі
Comment[nb]=mal for europeiske tegneserier i BD-stil
Comment[nds]=BD-Vörlaag för europääsche Comics
Comment[nl]=sjabloon voor Europese strips in BD-stijl
Comment[pl]=szablon dla Europejskiego stylu komików BD
Comment[pt]=modelo de banda desenhada europeu
Comment[pt_BR]=modelo para quadrinhos no estilo Europeu BD
Comment[sv]=seriemall med europeisk BD-stil
......
......@@ -16,6 +16,7 @@ Name[kk]=АҚШ-стильді комикс үлгісі
Name[nb]=Tegneseriemal i USA-stil
Name[nds]=Amerikaansch Comicvörlaag
Name[nl]=sjabloon voor strips in US-stijl
Name[pl]=Szablon komiksów Amerykańskiego stylu
Name[pt]=Modelo de banda desenhada dos EUA
Name[pt_BR]=Modelo de quadrinhos no estilo americano
Name[sv]=Seriemall med amerikansk stil
......@@ -37,6 +38,7 @@ Comment[kk]=АҚШ-стильдегі комикс үлгісі
Comment[nb]=mal for tegneserier i US-stil
Comment[nds]=Vörlaag för amerikaansche Comics
Comment[nl]=sjabloon voor strips in US-stijl
Comment[pl]=szablon dla Amerykańskiego stylu komiksów
Comment[pt]=modelo de banda desenhada do estilo dos EUA
Comment[pt_BR]=modelo para quadrinhos no estilo americano
Comment[sv]=seriemall med amerikansk stil
......
......@@ -17,6 +17,7 @@ Name[kk]=Үлгіні басқару
Name[nb]=Manga-mal
Name[nds]=Manga-Vörlaag
Name[nl]=Manga-sjabloon
Name[pl]=Szablon Mangi
Name[pt]=Modelo Manga
Name[pt_BR]=Modelo de mangá
Name[sv]=Manga-mall
......@@ -38,6 +39,7 @@ Comment[kk]=Жапондық манга-стильдегі комикс үлгі
Comment[nb]=mal for japanske tegneserier i Manga-stil
Comment[nds]=Vörlaag för japaansche Manga-Comics
Comment[nl]=sjabloon voor strips in Japanse Manga-stijl
Comment[pl]=szablon dla Japońskiego stylu komiksów Mangi
Comment[pt]=modelo de banda desenhada Manga do estilo Japonês
Comment[pt_BR]=modelo de quadrinhos no estilo mangá japonês
Comment[sv]=seriemall med japansk Manga-stil
......
......@@ -16,6 +16,7 @@ Name[kk]=торлы көзді
Name[nb]=vaffeljern-rutenett
Name[nds]=Wafeliesengadder
Name[nl]=wafelijzer-raster
Name[pl]=siatka gofrownicy
Name[pt]=grelha de ferro para 'waffles'
Name[pt_BR]=grade de ferro para 'waffles'
Name[sv]=våffelmönster
......@@ -36,6 +37,7 @@ Comment[kk]=300 н/д A4 торлы көзді парақтағы комикс
Comment[nb]=300 dpi, A4 tegneserieside med vaffeljern-rutenett, med tusj- og fargelag
Comment[nds]=300 dpi, A4 Wafeliesengadder-Comicsiet mit Dint un Klöörlagen.
Comment[nl]=300 dpi, A4 wafelijzer-raster strippagina met inkt en kleurlagen
Comment[pl]=300 dpi, strona A4 siatki gofrownicy z warstwami tuszu i koloru
Comment[pt]=banda desenhada A4, em grelha de 'waffle' a 300 ppp, com camadas de cores e de pinturas
Comment[pt_BR]=página de quadrinhos A4, em grade de 'waffle' a 300 ppp, com camadas de cores e de pinturas
Comment[sv]=300 punkter/tum, A4 våffelmönstrad seriesida med bläck- och färglager
......
......@@ -171,7 +171,6 @@ set(kritaimage_LIB_SRCS
kis_transform_worker.cc
kis_perspectivetransform_worker.cpp
kis_warptransform_worker.cc
kis_transformation_mask.cpp
kis_transparency_mask.cc
kis_undo_adapter.cc
krita_utils.cpp
......
......@@ -71,6 +71,7 @@ void KisAdjustmentLayer::setFilter(KisFilterConfiguration * filterConfig)
{
delete m_d->filterConfig;
m_d->filterConfig = KisFilterRegistry::instance()->cloneConfiguration(filterConfig);
m_d->filterConfig->setChannelFlags(channelFlags());
}
QRect KisAdjustmentLayer::changeRect(const QRect &rect, PositionToFilthy pos) const
......@@ -127,4 +128,12 @@ KoDocumentSectionModel::PropertyList KisAdjustmentLayer::sectionModelProperties(
return l;
}
void KisAdjustmentLayer::setChannelFlags(const QBitArray & channelFlags)
{
if (m_d->filterConfig) {
m_d->filterConfig->setChannelFlags(channelFlags);
}
KisLayer::setChannelFlags(channelFlags);
}
#include "kis_adjustment_layer.moc"
......@@ -110,6 +110,8 @@ public:
QRect changeRect(const QRect &rect, PositionToFilthy pos = N_FILTHY) const;
QRect needRect(const QRect &rect, PositionToFilthy pos = N_FILTHY) const;
void setChannelFlags(const QBitArray & channelFlags);
public slots:
/**
* gets this AdjustmentLayer. Overrides function in
......
......@@ -145,9 +145,6 @@ public:
bool visit(KisTransparencyMask*) {
return true;
}
bool visit(KisTransformationMask*) {
return true;
}
bool visit(KisSelectionMask*) {
return true;
}
......
......@@ -300,7 +300,7 @@ public:
/**
* Set the x offset of this layer in the image place.
* Re-implement this where it makes sense, by default it does
* nothing.
* nothing. It should not move child nodes.
*/
virtual void setX(qint32) {
}
......@@ -315,7 +315,7 @@ public:
/**
* Set the y offset of this layer in the image place.
* Re-implement this where it makes sense, by default it does
* nothing.
* nothing. It should not move child nodes.
*/
virtual void setY(qint32) {
}
......
......@@ -97,9 +97,6 @@ public:
bool visit(KisTransparencyMask*) {
return true;
}
bool visit(KisTransformationMask*) {
return true;
}
bool visit(KisSelectionMask*) {
return true;
}
......
......@@ -57,9 +57,6 @@ public:
bool visit(KisTransparencyMask*) {
return true;
}
bool visit(KisTransformationMask*) {
return true;
}
bool visit(KisSelectionMask*) {
return true;
}
......
......@@ -92,7 +92,7 @@ protected:
QList<KoChannelInfo *> convChannelList;
for (qint32 c = 0; c < channelInfo.count(); ++c) {
if (painterChannelFlags.testBit(channelInfo[c]->index())) {
if (painterChannelFlags.testBit(c)) {
convChannelList.append(channelInfo[c]);
}
}
......
......@@ -104,7 +104,7 @@ public:
m_noOfChannels = convChannelList.count();
// Pentalis comment: Find out if one of those is the alpha channel
qint8 alphaChannelIndex = -1; //-1 = FALSE
quint32 alphaChannelIndex = -1; //-1 = FALSE
for (quint32 i = 0; i < m_noOfChannels; ++i) {
if (convChannelList.at(i)->channelType() == KoChannelInfo::ALPHA) {
alphaChannelIndex = i;
......
......@@ -34,7 +34,6 @@
#include "kis_filter_mask.h"
#include "kis_transparency_mask.h"
#include "kis_selection_mask.h"
#include "kis_transformation_mask.h"
#include "generator/kis_generator_layer.h"
/**
* The count visitor traverses the node stack for nodes that conform
......@@ -97,10 +96,6 @@ public:
}
bool visit(KisTransformationMask *mask) {
return check(mask);
}
bool visit(KisGeneratorLayer * layer) {
return check(layer);
}
......
......@@ -29,7 +29,6 @@
#include "kis_paint_layer.h"
#include "kis_adjustment_layer.h"
#include "kis_transformation_mask.h"
#include "kis_transparency_mask.h"
#include "kis_filter_mask.h"
#include "kis_selection_mask.h"
......@@ -105,9 +104,6 @@ public:
bool visit(KisTransparencyMask *mask) {
return cropPaintDeviceNode(mask);
}
bool visit(KisTransformationMask *mask) {
return cropPaintDeviceNode(mask);
}
bool visit(KisSelectionMask *mask) {
return cropPaintDeviceNode(mask);
}
......
......@@ -21,6 +21,7 @@
#include <KoColorSpaceRegistry.h>
#include <KoCompositeOp.h>
#include "kis_layer.h"
#include "kis_filter_mask.h"
#include "filter/kis_filter.h"
#include "filter/kis_filter_configuration.h"
......@@ -87,6 +88,9 @@ void KisFilterMask::setFilter(KisFilterConfiguration * filterConfig)
Q_ASSERT(filterConfig);
delete m_d->filterConfig;
m_d->filterConfig = KisFilterRegistry::instance()->cloneConfiguration(filterConfig);
if (parent() && parent()->inherits("KisLayer")) {
m_d->filterConfig->setChannelFlags(qobject_cast<KisLayer*>(parent().data())->channelFlags());
}
}
QRect KisFilterMask::decorateRect(KisPaintDeviceSP &src,
......
......@@ -56,6 +56,8 @@ KisGroupLayer::KisGroupLayer(const KisGroupLayer &rhs) :
m_d(new Private())
{
m_d->paintDevice = new KisPaintDevice(*rhs.m_d->paintDevice.data());
m_d->x = rhs.m_d->x;
m_d->y = rhs.m_d->y;
m_d->paintDevice->setDefaultPixel(const_cast<KisGroupLayer*>(&rhs)->m_d->paintDevice->defaultPixel());
}
......@@ -163,13 +165,7 @@ qint32 KisGroupLayer::y() const
void KisGroupLayer::setX(qint32 x)
{
qint32 numChildren = childCount();
qint32 delta = x - m_d->x;
for (qint32 i = 0; i < numChildren; ++i) {
KisNodeSP layer = at(i);
layer->setX(layer->x() + delta);
}
m_d->x = x;
if(m_d->paintDevice) {
m_d->paintDevice->setX(m_d->paintDevice->x() + delta);
......@@ -179,13 +175,7 @@ void KisGroupLayer::setX(qint32 x)
void KisGroupLayer::setY(qint32 y)
{
qint32 numChildren = childCount();
qint32 delta = y - m_d->y;
for (qint32 i = 0; i < numChildren; ++i) {
KisNodeSP layer = at(i);
layer->setY(layer->y() + delta);
}
m_d->y = y;
if(m_d->paintDevice) {
m_d->paintDevice->setY(m_d->paintDevice->y() + delta);
......
......@@ -735,8 +735,7 @@ void KisImage::flatten()
setModified();
}
// FIXME: Rename to Merge Down?
KisLayerSP KisImage::mergeLayer(KisLayerSP layer, const KisMetaData::MergeStrategy* strategy)
KisLayerSP KisImage::mergeDown(KisLayerSP layer, const KisMetaData::MergeStrategy* strategy)
{
if(!layer->prevSibling()) return 0;
......@@ -992,11 +991,6 @@ void KisImage::notifyLayersChanged()
emit sigPostLayersChanged(rootLayer());
}
void KisImage::notifyPropertyChanged(KisLayerSP layer)
{
emit sigLayerPropertiesChanged(layer);
}
QRect KisImage::bounds() const
{
return QRect(0, 0, width(), height());
......
......@@ -423,7 +423,7 @@ public:
* Merge the specified layer with the layer
* below this layer, remove the specified layer.
*/
KisLayerSP mergeLayer(KisLayerSP l, const KisMetaData::MergeStrategy* strategy);
KisLayerSP mergeDown(KisLayerSP l, const KisMetaData::MergeStrategy* strategy);
/**
* flatten the layer: that is, the projection becomes the layer
......@@ -440,8 +440,6 @@ public:
/// use if the layers have changed _completely_ (eg. when flattening)
void notifyLayersChanged();
void notifyPropertyChanged(KisLayerSP layer);
/**
* Called whenever a layer has changed. The layer is added to a
* list of dirty layers and as soon as the document stores the
......@@ -482,9 +480,6 @@ public:
signals:
/// Emitted after a layer's properties (visible, locked, opacity, composite op, name, ...) change
void sigLayerPropertiesChanged(KisLayerSP layer);
/**