4 files changed, 40 insertions, 6 deletions

diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp
index 3331193..d9d0ce0 100644
--- a/noncore/graphics/drawpad/drawpad.cpp
+++ b/noncore/graphics/drawpad/drawpad.cpp
@@ -54,6 +54,8 @@ DrawPad::DrawPad(QWidget* parent, const char* name,  WFlags /*fl*/ )
     : QMainWindow(parent, name, WStyle_ContextHelp)
 {
     // init members
+    connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)),
+             this, SLOT(slotAppMessage(const QCString&, const QByteArray&)) );
 
     m_pDrawPadCanvas = new DrawPadCanvas(this, this);
 
@@ -663,3 +665,20 @@ void DrawPad::saveConfig()
     config.writeEntry("PenColor", m_pen.color().name());
     config.writeEntry("BrushColor", m_brush.color().name());
 }
+
+
+/*
+ * Import a  Thumbnail from SCAP or similiar
+ */
+void DrawPad::slotAppMessage( const QCString& str, const QByteArray& ar ) {
+    QDataStream stream(ar, IO_ReadOnly );
+    /*
+     * import the pixmap
+     */
+    if ( str == "importPixmap(QPixmap)" ) {
+        QPixmap pix;
+        stream >> pix;;
+        m_pDrawPadCanvas->importPixmap( pix );
+        QPEApplication::setKeepRunning();
+    }
+}
diff --git a/noncore/graphics/drawpad/drawpad.h b/noncore/graphics/drawpad/drawpad.h
index 8ba6e58..ba9e47d 100644
--- a/noncore/graphics/drawpad/drawpad.h
+++ b/noncore/graphics/drawpad/drawpad.h
@@ -48,6 +48,8 @@ private slots:
     void clearPage();
     void deletePage();
 
+    void slotAppMessage( const QCString&, const QByteArray& );
+
     void setPointTool();
     void setLineTool();
     void setRectangleTool();
diff --git a/noncore/graphics/drawpad/drawpadcanvas.cpp b/noncore/graphics/drawpad/drawpadcanvas.cpp
index 446096c..423ef26 100644
--- a/noncore/graphics/drawpad/drawpadcanvas.cpp
+++ b/noncore/graphics/drawpad/drawpadcanvas.cpp
@@ -180,7 +180,7 @@ void DrawPadCanvas::load(QIODevice* ioDevice)
     m_pages = drawPadCanvasXmlHandler.pages();
 
     if (m_pages.isEmpty()) {
-        m_pages.append(new Page("",         
+        m_pages.append(new Page("",
 		clipper()->width()+(verticalScrollBar()->isVisible()?verticalScrollBar()->width():0),
 	        clipper()->height()+(horizontalScrollBar()->isVisible()?horizontalScrollBar()->height():0)));
         m_pages.current()->pixmap()->fill(Qt::white);
@@ -194,7 +194,7 @@ void DrawPadCanvas::load(QIODevice* ioDevice)
 
 void DrawPadCanvas::initialPage()
 {
-    m_pages.append(new Page("", 
+    m_pages.append(new Page("",
 	clipper()->width()+(verticalScrollBar()->isVisible()?verticalScrollBar()->width():0),
 	clipper()->height()+(horizontalScrollBar()->isVisible()?horizontalScrollBar()->height():0)));
 	//236, 232)); no more fixed sizes
@@ -265,6 +265,18 @@ void DrawPadCanvas::importPage(const QString& fileName)
     emit pagesChanged();
 }
 
+void DrawPadCanvas::importPixmap( const QPixmap& pix ) {
+    Page* importedPage = new Page();
+
+    (*importedPage->pixmap()) = pix;
+    m_pages.insert(m_pages.at()+1, importedPage );
+    resizeContents(m_pages.current()->pixmap()->width(),
+                   m_pages.current()->pixmap()->height() );
+    viewport()->update();
+
+    emit pagesChanged();
+}
+
 void DrawPadCanvas::exportPage(uint fromPage, uint toPage, const QString& name,const QString& format)
 {
     if (fromPage == toPage) {
@@ -353,7 +365,7 @@ void DrawPadCanvas::deleteAll()
 {
     m_pages.clear();
 
-    m_pages.append(new Page("",         
+    m_pages.append(new Page("",
 	clipper()->width()+(verticalScrollBar()->isVisible()?verticalScrollBar()->width():0),
         clipper()->height()+(horizontalScrollBar()->isVisible()?horizontalScrollBar()->height():0)));
 
@@ -389,7 +401,7 @@ void DrawPadCanvas::deletePage()
     m_pages.remove(m_pages.current());
 
     if (m_pages.isEmpty()) {
-        m_pages.append(new Page("",         
+        m_pages.append(new Page("",
 		clipper()->width()+(verticalScrollBar()->isVisible()?verticalScrollBar()->width():0),
 	        clipper()->height()+(horizontalScrollBar()->isVisible()?horizontalScrollBar()->height():0)));
 
diff --git a/noncore/graphics/drawpad/drawpadcanvas.h b/noncore/graphics/drawpad/drawpadcanvas.h
index 80a2a7e..2b3d4a5 100644
--- a/noncore/graphics/drawpad/drawpadcanvas.h
+++ b/noncore/graphics/drawpad/drawpadcanvas.h
@@ -23,7 +23,7 @@ class DrawPad;
 class Page;
 
 class DrawPadCanvas : public QScrollView
-{ 
+{
     Q_OBJECT
 
 public:
@@ -36,6 +36,7 @@ public:
 
     void importPage(const QString& fileName);
     void exportPage(uint fromPage, uint toPage, const QString& name, const QString& format);
+    void importPixmap( const QPixmap& );
 
     bool goPreviousPageEnabled();
     bool goNextPageEnabled();
@@ -56,7 +57,7 @@ public slots:
     void deletePage();
     void movePageUp();
     void movePageDown();
-    
+
     void undo();
     void redo();