From 2785103a6bd4de55bd26d79e34d0fdd4b329a73a Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 26 Jun 2011 00:29:37 +0000 Subject: Remove krita* in preparation for name switch from Krita to Chalk git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238361 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- krita/plugins/viewplugins/substrate/Makefile.am | 26 --- .../plugins/viewplugins/substrate/dlg_substrate.cc | 59 ------ .../plugins/viewplugins/substrate/dlg_substrate.h | 62 ------ .../substrate/kis_repeating_substrate.cc | 0 .../substrate/kis_repeating_substrate.h | 69 ------- .../viewplugins/substrate/kritasubstrate.desktop | 35 ---- krita/plugins/viewplugins/substrate/substrate.cc | 78 -------- krita/plugins/viewplugins/substrate/substrate.h | 45 ----- krita/plugins/viewplugins/substrate/substrate.rc | 8 - .../plugins/viewplugins/substrate/wdgsubstrate.ui | 221 --------------------- 10 files changed, 603 deletions(-) delete mode 100644 krita/plugins/viewplugins/substrate/Makefile.am delete mode 100644 krita/plugins/viewplugins/substrate/dlg_substrate.cc delete mode 100644 krita/plugins/viewplugins/substrate/dlg_substrate.h delete mode 100644 krita/plugins/viewplugins/substrate/kis_repeating_substrate.cc delete mode 100644 krita/plugins/viewplugins/substrate/kis_repeating_substrate.h delete mode 100644 krita/plugins/viewplugins/substrate/kritasubstrate.desktop delete mode 100644 krita/plugins/viewplugins/substrate/substrate.cc delete mode 100644 krita/plugins/viewplugins/substrate/substrate.h delete mode 100644 krita/plugins/viewplugins/substrate/substrate.rc delete mode 100644 krita/plugins/viewplugins/substrate/wdgsubstrate.ui (limited to 'krita/plugins/viewplugins/substrate') diff --git a/krita/plugins/viewplugins/substrate/Makefile.am b/krita/plugins/viewplugins/substrate/Makefile.am deleted file mode 100644 index 01927b91..00000000 --- a/krita/plugins/viewplugins/substrate/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -kritarcdir = $(kde_datadir)/kritaplugins -kritarc_DATA = substrate.rc - -EXTRA_DIST = $(kritarc_DATA) - - -INCLUDES = -I$(srcdir)/../../../sdk \ - -I$(srcdir)/../../../core \ - -I$(srcdir)/../../../kritacolor/ \ - -I$(srcdir)/../../../ui \ - -I$/../../../ui \ - $(KOFFICE_INCLUDES) \ - $(all_includes) - -kde_module_LTLIBRARIES = kritasubstrate.la - -kritasubstrate_la_SOURCES = substrate.cc dlg_substrate.cc wdgsubstrate.ui kis_repeating_substrate.cc -noinst_HEADERS = wdgsubstrate.h dlg_substrate.h kis_repeating_substrate.h substrate.h - -kritasubstrate_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kritablurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \ - -L../../../../krita/ui/.libs -lkritaui -L../../../../lib/kofficeui/.libs -lkofficeui -kritasubstrate_la_LIBADD = ../../../libkritacommon.la - -kde_services_DATA = kritasubstrate.desktop - -METASOURCES = AUTO diff --git a/krita/plugins/viewplugins/substrate/dlg_substrate.cc b/krita/plugins/viewplugins/substrate/dlg_substrate.cc deleted file mode 100644 index 51de887d..00000000 --- a/krita/plugins/viewplugins/substrate/dlg_substrate.cc +++ /dev/null @@ -1,59 +0,0 @@ -/* - * dlg_substrate.cc - part of KimageShop^WKrayon^WKrita - * - * Copyright (c) 2004 Boudewijn Rempt - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include - -#include "dlg_substrate.h" -#include "wdgsubstrate.h" - - -DlgSubstrate::DlgSubstrate( TQWidget * tqparent, - const char * name) - : super (tqparent, name, true, i18n("Color Range"), Ok | Cancel, Ok) -{ - m_previewPix = TQPixmap(); - m_page = new WdgSubstrate(this, "substrate"); - Q_CHECK_PTR(m_page); - setCaption(i18n("Substrate")); - setMainWidget(m_page); - resize(m_page -> size()); - - connect(this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(okClicked())); -} - -DlgSubstrate::~DlgSubstrate() -{ - delete m_page; -} - -void DlgSubstrate::setPixmap(TQPixmap pix) -{ - m_previewPix = pix; - m_previewPix.detach(); -} - -void DlgSubstrate::okClicked() -{ - accept(); -} - -#include "dlg_substrate.moc" - diff --git a/krita/plugins/viewplugins/substrate/dlg_substrate.h b/krita/plugins/viewplugins/substrate/dlg_substrate.h deleted file mode 100644 index 869eaafa..00000000 --- a/krita/plugins/viewplugins/substrate/dlg_substrate.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * dlg_substrate.h -- part of KimageShop^WKrayon^WKrita - * - * Copyright (c) 2004 Boudewijn Rempt - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#ifndef DLG_SUBSTRATE -#define DLG_SUBSTRATE - -#include - -#include - -#include "wdgsubstrate.h" - - -/** - * This dialog allows the user to modify a layer or a selection - * by adding more colour in a particular channel or lighten or - * darken an image. - */ -class DlgSubstrate: public KDialogBase { - - typedef KDialogBase super; - Q_OBJECT - TQ_OBJECT - -public: - - DlgSubstrate(TQWidget * tqparent = 0, - const char* name = 0); - ~DlgSubstrate(); - - /** - * Set the initial preview pixmap - */ - void setPixmap(TQPixmap pix); - -private slots: - - void okClicked(); - -private: - - WdgSubstrate * m_page; - TQPixmap m_previewPix; -}; - -#endif // DLG_SUBSTRATE diff --git a/krita/plugins/viewplugins/substrate/kis_repeating_substrate.cc b/krita/plugins/viewplugins/substrate/kis_repeating_substrate.cc deleted file mode 100644 index e69de29b..00000000 diff --git a/krita/plugins/viewplugins/substrate/kis_repeating_substrate.h b/krita/plugins/viewplugins/substrate/kis_repeating_substrate.h deleted file mode 100644 index 1a229dc1..00000000 --- a/krita/plugins/viewplugins/substrate/kis_repeating_substrate.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2006 Boudewijn Rempt (boud@valdyas.org) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#ifndef KIS_SUBSTRATE_H -#define KIS_SUBSTRATE_H - -#include -#include - -class KisImage; - -/// All values are normalized to a range between 0 and 1. -/// XXX: Do we need more? -struct KisSubstratePixel { - float height; // absolute height of the current position - float smoothness; // determines how easily the painting tool "slips" over the surface - float absorbency; // determines how much wetness the substrate can absorb. XXX: How about speed of absorbing? - float r; //.Red component of reflectivity - float g; // Green component of reflectivity - float b; // Blue component of reflectivity - float transmittance; // Similar to alpha. XXX: Ask Leonardo about this. -}; - -/** - * This abstract class defines the properties of a substrate -- that is, the simulation - * of the paper or canvas for natural media. - * - * Subclass this interface to define a specific type of substrate: repeating, - * or full-size, with specific and cool ways of generating the surface, or - * maybe based on scans of real substrates. - */ -class KisSubstrate : public KShared { - -public: - - KisSubstrate(KisImage * /*img*/) : KShared() {}; - virtual ~KisSubstrate() {}; - - - /** - * Copy the pixel values in the specified rect into an array of Substrate. - * Make sure the array is big enough! - */ - virtual void getPixels(KisSubstratePixel * /*substrate*/, const TQRect & /*rc*/) = 0; - - /** - * Return a pointer to the substrate at the specified position. Note that - * you cannot do pointe arithmetic with this value: the position of the - * neighbouring pixels cannot be determined from this value - */ - virtual KisSubstratePixel * getPixel(uint x, uint y) = 0; - -}; - -#endif diff --git a/krita/plugins/viewplugins/substrate/kritasubstrate.desktop b/krita/plugins/viewplugins/substrate/kritasubstrate.desktop deleted file mode 100644 index 85e58263..00000000 --- a/krita/plugins/viewplugins/substrate/kritasubstrate.desktop +++ /dev/null @@ -1,35 +0,0 @@ -[Desktop Entry] -Name=Substrate -Name[bg]=Основа -Name[ca]=Substrat -Name[da]=Substrat -Name[de]=Träger -Name[el]=Υπόστρωμα -Name[es]=Sustrato -Name[et]=Substraat -Name[fa]=زیربنا -Name[fy]=Substraat -Name[ga]=Foshraith -Name[gl]=Substrato -Name[hu]=Szubsztrát -Name[it]=Substrato -Name[ja]=下地 -Name[nb]=Substrat -Name[nds]=Wassboden -Name[ne]=जीवाधार -Name[nl]=Substraat -Name[pl]=Wycięcie -Name[pt]=Substrato -Name[pt_BR]=Substrato -Name[ru]=Подложка -Name[sk]=Substrát -Name[sl]=Substrat -Name[sr]=Супстрат -Name[sr@Latn]=Supstrat -Name[sv]=Substrat -Name[uk]=Підложка -Name[zh_TW]=基底 -ServiceTypes=Krita/ViewPlugin -Type=Service -X-KDE-Library=kritasubstrate -X-Krita-Version=2 diff --git a/krita/plugins/viewplugins/substrate/substrate.cc b/krita/plugins/viewplugins/substrate/substrate.cc deleted file mode 100644 index 996516e1..00000000 --- a/krita/plugins/viewplugins/substrate/substrate.cc +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2006 Boudewijn Rempt (boud@valdyas.org) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#include - -#include - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "substrate.h" -#include "dlg_substrate.h" - -typedef KGenericFactory SubstrateFactory; -K_EXPORT_COMPONENT_FACTORY( kritasubstrate, SubstrateFactory( "krita" ) ) - -SubstratePlugin::SubstratePlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) -{ - - if ( tqparent->inherits("KisView") ) - { - setInstance(SubstrateFactory::instance()); - setXMLFile(locate("data","kritaplugins/substrate.rc"), true); - - (void) new KAction(i18n("&Substrate..."), 0, 0, this, TQT_SLOT(slotSubstrateActivated()), actionCollection(), "substrate"); - - m_view = (KisView*) tqparent; - } -} - -SubstratePlugin::~SubstratePlugin() -{ -} - -void SubstratePlugin::slotSubstrateActivated() -{ - DlgSubstrate * dlgSubstrate = new DlgSubstrate(m_view, "Substrate"); - Q_CHECK_PTR(dlgSubstrate); - if (dlgSubstrate -> exec() == TQDialog::Accepted) { - // Retrieve changes made by dialog - // Apply changes to layer (selection) - } - delete dlgSubstrate; -} - -#include "substrate.moc" - diff --git a/krita/plugins/viewplugins/substrate/substrate.h b/krita/plugins/viewplugins/substrate/substrate.h deleted file mode 100644 index 2d00e234..00000000 --- a/krita/plugins/viewplugins/substrate/substrate.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * substrate.h -- Part of Krita - * - * Copyright (c) 2006 Boudewijn Rempt (boud@valdyas.org) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef SUBSTATE_H -#define SUBSTATE_H - -#include - -class KisView; - -class SubstratePlugin : public KParts::Plugin -{ - Q_OBJECT - TQ_OBJECT -public: - SubstratePlugin(TQObject *tqparent, const char *name, const TQStringList &); - virtual ~SubstratePlugin(); - -private slots: - void slotSubstrateActivated(); - -private: - KisView * m_view; - KisPainter * m_painter; - -}; - -#endif // SUBSTATE_H diff --git a/krita/plugins/viewplugins/substrate/substrate.rc b/krita/plugins/viewplugins/substrate/substrate.rc deleted file mode 100644 index 4251e87f..00000000 --- a/krita/plugins/viewplugins/substrate/substrate.rc +++ /dev/null @@ -1,8 +0,0 @@ - - - - Image - - - - diff --git a/krita/plugins/viewplugins/substrate/wdgsubstrate.ui b/krita/plugins/viewplugins/substrate/wdgsubstrate.ui deleted file mode 100644 index be0713ed..00000000 --- a/krita/plugins/viewplugins/substrate/wdgsubstrate.ui +++ /dev/null @@ -1,221 +0,0 @@ - -WdgSubstrate - - - Form1 - - - - 0 - 0 - 478 - 358 - - - - - unnamed - - - - grpCustom - - - Custom Canvas Definition - - - - unnamed - - - - tqlayout3 - - - - unnamed - - - - - Custom - - - - cmbPredefinedCanvases - - - - - bnBackground - - - - - - - - textLabel1 - - - Save custom substrate as: - - - - - lblPredefined - - - &Pre-defined canvas types: - - - cmbPredefinedCanvases - - - - - lblColor - - - &Basic color: - - - bnBackground - - - - - lineEdit1 - - - - - - - tqlayout2 - - - - unnamed - - - - slAbsorbency - - - Horizontal - - - - - slFiber - - - Horizontal - - - - - textLabel9 - - - Grainy - - - - - lblSmoothness - - - &Smooth: - - - slSlippery - - - - - lblAbsorbency - - - &Water repellant: - - - slAbsorbency - - - - - slSlippery - - - Horizontal - - - - - lblHeight - - - &Flat: - - - slHeight - - - - - lblFiber - - - Fine &fiber: - - - slFiber - - - - - lblRough - - - Rough - - - - - slHeight - - - Horizontal - - - - - textLabel11 - - - Absorbent - - - - - textLabel10 - - - Coarse - - - - - - - - - - - - - kcolorbutton.h - - -- cgit v1.2.1