Commit 8f7165d0 authored by Halla Rempt's avatar Halla Rempt
Browse files

Reinstate the filters menu -- and the filters

appear to be working just fine.

svn path=/trunk/koffice/; revision=599870
parent 74459bc7
#add_subdirectory( filters )
add_subdirectory( filters )
add_subdirectory( paintops )
#add_subdirectory( tools )
#add_subdirectory( viewplugins )
......
......@@ -63,6 +63,7 @@ KisFilterManager::KisFilterManager(KisView2 * view, KisDoc2 * doc)
connect(m_filterMapper, SIGNAL(mapped(int)), this, SLOT(slotApplyFilter(int)));
setup( view->actionCollection() );
}
KisFilterManager::~KisFilterManager()
......
......@@ -34,6 +34,7 @@ class KisView2;
class KisDoc;
class KisFilter;
class KisFilterConfiguration;
class KisFilterConfigWidget;
class KActionCollection;
class KisPreviewDialog;
......
......@@ -42,12 +42,14 @@
#include "kis_qpainter_canvas.h"
#include "kis_doc2.h"
#include "kis_resource_provider.h"
#include "kis_filter_manager.h"
class KisView2::KisView2Private {
public:
KisView2Private(KisView2 * view)
: filterManager( 0 )
{
viewConverter = new KoZoomHandler( );
......@@ -63,6 +65,7 @@ public:
{
delete viewConverter;
delete canvas;
delete filterManager;
}
public:
......@@ -72,6 +75,7 @@ public:
KoViewConverter *viewConverter;
KoCanvasController * canvasController;
KisResourceProvider * resourceProvider;
KisFilterManager * filterManager;
KAction *zoomAction;
KAction *zoomIn;
KAction *zoomOut;
......@@ -114,6 +118,10 @@ KisView2::KisView2(KisDoc2 * doc, QWidget * parent)
m_d->fitToCanvas = KStdAction::fitToPage(this, SLOT(slotFitToCanvas()), actionCollection(), "fit_to_canvas");
*/
// Create the managers for filters, selections, layers etc.
// XXX: When the currentlayer changes, call updateGUI on all managers
m_d->filterManager = new KisFilterManager(this, m_d->doc);
// Put the canvascontroller in a layout so it resizes with us
QHBoxLayout * layout = new QHBoxLayout( this );
layout->addWidget( m_d->canvasController );
......@@ -160,6 +168,7 @@ void KisView2::slotInitializeCanvas()
<< image()->width() << ", H: "
<< image()->height() << endl;
m_d->canvas->setCanvasSize( image()->width(), image()->height() );
m_d->filterManager->updateGUI();
}
void KisView2::slotZoomChanged(KoZoomMode::Mode mode, int zoom)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment