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

List:       kde-commits
Subject:    koffice/krita/plugins/extensions/dockers/digitalmixer
From:       Cyrille Berger <cyb () lepi ! org>
Date:       2010-01-29 20:48:22
Message-ID: 1264798102.499727.12955.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1082150 by berger:

Fix: loading of digital mixer


 M  +5 -13     digitalmixer.cc  
 M  +1 -3      digitalmixer_dock.cc  
 M  +1 -2      digitalmixer_dock.h  
 M  +1 -1      krita_digitalmixer.desktop  


--- trunk/koffice/krita/plugins/extensions/dockers/digitalmixer/digitalmixer.cc \
#1082149:1082150 @@ -37,14 +37,14 @@
 #include "kis_view2.h"
 
 #include "digitalmixer_dock.h"
+#include <KoDockRegistry.h>
 
 K_PLUGIN_FACTORY(DigitalMixerPluginFactory, registerPlugin<DigitalMixerPlugin>();)
 K_EXPORT_PLUGIN(DigitalMixerPluginFactory( "krita" ) )
 
 class DigitalMixerDockFactory : public KoDockFactoryBase {
 public:
-    DigitalMixerDockFactory(KisView2 * view)
-        : m_view( view )
+    DigitalMixerDockFactory()
     {
     }
 
@@ -60,7 +60,7 @@
 
     virtual QDockWidget* createDockWidget()
     {
-        DigitalMixerDock * dockWidget = new DigitalMixerDock(m_view);
+        DigitalMixerDock * dockWidget = new DigitalMixerDock();
         
         dockWidget->setObjectName(id());
 
@@ -72,23 +72,15 @@
         return DockMinimized;
     }
 private:
-    KisView2 * m_view;
 
+
 };
 
 
 DigitalMixerPlugin::DigitalMixerPlugin(QObject *parent, const QVariantList &)
     : QObject(parent)
 {
-    dbgPlugins << "DigitalMixerPlugin";
-    if ( parent->inherits("KisView2") )
-    {
-        m_view = (KisView2*) parent;
-
-        //setComponentData(DigitalMixerPluginFactory::componentData());
-        DigitalMixerDockFactory dockFactory( m_view);
-        m_view->createDockWidget( &dockFactory );
-    }
+    KoDockRegistry::instance()->add(new DigitalMixerDockFactory());
 }
 
 DigitalMixerPlugin::~DigitalMixerPlugin()
--- trunk/koffice/krita/plugins/extensions/dockers/digitalmixer/digitalmixer_dock.cc \
#1082149:1082150 @@ -17,8 +17,6 @@
 
 #include "digitalmixer_dock.h"
 
-#include <kis_view2.h>
-
 #include <QGridLayout>
 #include <QToolButton>
 #include <QSignalMapper>
@@ -41,7 +39,7 @@
         }
 };
 
-DigitalMixerDock::DigitalMixerDock( KisView2 *view ) : QDockWidget(i18n("Digital \
Colors Mixer")), m_canvas(0), m_view(view), m_tellCanvas(true) \
+DigitalMixerDock::DigitalMixerDock( ) : QDockWidget(i18n("Digital Colors Mixer")), \
m_canvas(0), m_tellCanvas(true)  {
     QColor initColors[6] = { Qt::black, Qt::white, Qt::red, Qt::green, Qt::blue, \
Qt::yellow };  
--- trunk/koffice/krita/plugins/extensions/dockers/digitalmixer/digitalmixer_dock.h \
#1082149:1082150 @@ -30,7 +30,7 @@
 class DigitalMixerDock : public QDockWidget, public KoCanvasObserverBase {
     Q_OBJECT
 public:
-    DigitalMixerDock( KisView2 *view );
+    DigitalMixerDock( );
     /// reimplemented from KoCanvasObserverBase
     virtual void setCanvas(KoCanvasBase *canvas);
 public slots:
@@ -42,7 +42,6 @@
     void targetColorChanged(int);
 private:
     KoCanvasBase* m_canvas;
-    KisView2* m_view;
     KoColor m_currentColor;
     KoColorPatch* m_currentColorPatch;
     struct Mixer {
--- trunk/koffice/krita/plugins/extensions/dockers/digitalmixer/krita_digitalmixer.desktop \
#1082149:1082150 @@ -27,7 +27,7 @@
 Comment[uk]=Цифровий мікшер
 Comment[x-test]=xxDigitalMixerxx
 Comment[zh_TW]=數位混合器
-X-KDE-ServiceTypes=Krita/ViewPlugin
+X-KDE-ServiceTypes=Krita/Dock
 Type=Service
 X-KDE-Library=kritadigitalmixer
 X-Krita-Version=3


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