[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/krita
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2006-11-23 21:09:54
Message-ID: 1164316194.620925.28519.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 607251 by rempt:

Colorspaceconversion plugin is back


 M  +1 -1      plugins/CMakeLists.txt  
 M  +2 -2      plugins/viewplugins/CMakeLists.txt  
 M  +5 -4      plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc  
 M  +3 -3      plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc  
 M  +1 -1      ui/kis_dlg_image_properties.cc  
 M  +38 -5     ui/kis_view2.cpp  
 M  +1 -0      ui/kis_view2.h  


--- trunk/koffice/krita/plugins/CMakeLists.txt #607250:607251
@@ -1,6 +1,6 @@
 add_subdirectory( filters )
 add_subdirectory( paintops )
 add_subdirectory( tools )
-#add_subdirectory( viewplugins )
+add_subdirectory( viewplugins )
 
 
--- trunk/koffice/krita/plugins/viewplugins/CMakeLists.txt #607250:607251
@@ -1,8 +1,8 @@
 
 #add_subdirectory( performancetest )
 #add_subdirectory( colorrange )
-#add_subdirectory( colorspaceconversion )
-add_subdirectory( dropshadow )
+add_subdirectory( colorspaceconversion )
+#add_subdirectory( dropshadow )
 #add_subdirectory( filtersgallery )
 #add_subdirectory( histogram )
 #add_subdirectory( histogram_docker )
--- trunk/koffice/krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc \
#607250:607251 @@ -34,13 +34,14 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 
-#include "kis_doc.h"
+#include "kis_types.h"
+#include "kis_annotation.h"
+#include "kis_doc2.h"
 #include "kis_config.h"
 #include "kis_cursor.h"
 #include "kis_image.h"
 #include "kis_layer.h"
 #include "kis_global.h"
-#include "kis_types.h"
 #include "kis_meta_registry.h"
 #include "kis_view2.h"
 #include "kis_paint_device.h"
@@ -63,8 +64,8 @@
         m_view = (KisView2*) parent;
 
         setInstance(ColorSpaceConversionFactory::instance());
-        
-setXMLFile(KStandardDirs::locate("data","kritaplugins/colorspaceconversion.rc"), 
+
+setXMLFile(KStandardDirs::locate("data","kritaplugins/colorspaceconversion.rc"),
 true);
 
         KAction *action = new KAction(i18n("&Convert Image Type..."), \
                actionCollection(), "imgcolorspaceconversion");
--- trunk/koffice/krita/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc \
#607250:607251 @@ -28,11 +28,11 @@
 #include <knuminput.h>
 #include <kdebug.h>
 
-#include "kis_meta_registry.h"
 #include "KoColorSpaceRegistry.h"
 #include "KoColorProfile.h"
 #include "KoColorSpace.h"
 #include "KoID.h"
+
 #include "kis_cmb_idlist.h"
 #include "squeezedcombobox.h"
 
@@ -53,7 +53,7 @@
     setMainWidget(m_page);
     resize(m_page->sizeHint());
 
-    m_page->cmbColorSpaces->setIDList(KisMetaRegistry::instance()->csRegistry()->listKeys());
 +    m_page->cmbColorSpaces->setIDList(KoColorSpaceRegistry::instance()->listKeys());
  
     fillCmbDestProfile(m_page->cmbColorSpaces->currentItem());
 
@@ -88,7 +88,7 @@
 {
     m_page->cmbDestProfile->clear();
 
-    QList<KoColorProfile *>  profileList = \
KisMetaRegistry::instance()->csRegistry()->profilesFor(s); +    QList<KoColorProfile \
*>  profileList = KoColorSpaceRegistry::instance()->profilesFor(s);  
     foreach (KoColorProfile *profile, profileList) {
         m_page->cmbDestProfile->addSqueezedItem(profile->productName());
--- trunk/koffice/krita/ui/kis_dlg_image_properties.cc #607250:607251
@@ -70,7 +70,7 @@
 
     //m_page->cmbColorSpaces->hide();
     //m_page->lblColorSpaces->setText(image->colorSpace()->id().name());
-    QList<KoID> colorSpaces = KisMetaRegistry::instance()->csRegistry()->listKeys();
+    QList<KoID> colorSpaces = KoColorSpaceRegistry::instance()->listKeys();
     qint32 i = colorSpaces.indexOf(KoID("WET",""));
     if (i >= 0) {
         colorSpaces.removeAt(i);
--- trunk/koffice/krita/ui/kis_view2.cpp #607250:607251
@@ -24,15 +24,21 @@
 #include <QDragEnterEvent>
 #include <QApplication>
 
-#include <kurl.h>
-#include <kstdaction.h>
-#include <kxmlguifactory.h>
+#include <k3urldrag.h>
+#include <kaction.h>
 #include <klocale.h>
-#include <kaction.h>
-#include <k3urldrag.h>
 #include <kmenu.h>
+#include <kparts/componentfactory.h>
+#include <kparts/event.h>
+#include <kparts/plugin.h>
+#include <kservice.h>
+#include <kservicetypetrader.h>
 #include <kstdaction.h>
+#include <kstdaction.h>
 #include <ktogglefullscreenaction.h>
+#include <kurl.h>
+#include <kxmlguifactory.h>
+#include <kxmlguifactory.h>
 
 #include <KoMainWindow.h>
 #include <KoCanvasController.h>
@@ -174,6 +180,7 @@
     createManagers();
     createGUI();
 
+    loadPlugins();
 
     // Wait for the async image to have loaded
     if ( m_d->doc->isLoading() ) {
@@ -606,5 +613,31 @@
 }
 
 
+void KisView2::loadPlugins()
+{
+    // Load all plugins
+    KService::List offers = \
KServiceTypeTrader::self()->query(QString::fromLatin1("Krita/ViewPlugin"), +          \
QString::fromLatin1("(Type == 'Service') and " +                                      \
"([X-Krita-Version] == 3)")); +    KService::List::ConstIterator iter;
+    for(iter = offers.begin(); iter != offers.end(); ++iter)
+    {
+        KService::Ptr service = *iter;
+        int errCode = 0;
+        KParts::Plugin* plugin =
+            KService::createInstance<KParts::Plugin> ( service, this, QStringList(), \
&errCode); +        if ( plugin ) {
+            kDebug(41006) << "found plugin " << service->property("Name").toString() \
<< "\n"; +            insertChildClient(plugin);
+        }
+        else {
+            kDebug(41006) << "found plugin " << service->property("Name").toString() \
<< ", " << errCode << "\n"; +            if( errCode == KLibLoader::ErrNoLibrary)
+            {
+                kWarning(41006) << " Error loading plugin was : ErrNoLibrary " << \
KLibLoader::self()->lastErrorMessage() << endl; +            }
+        }
+    }
+}
 
 #include "kis_view2.moc"
--- trunk/koffice/krita/ui/kis_view2.h #607250:607251
@@ -126,6 +126,7 @@
     void createActions();
     void createManagers();
 
+    void loadPlugins();
 
 
 private:


[prev in list] [next in list] [prev in thread] [next in thread]