6 files changed, 43 insertions, 6 deletions

diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp
index 45fb886..b29f5ba 100644
--- a/noncore/graphics/drawpad/drawpad.cpp
+++ b/noncore/graphics/drawpad/drawpad.cpp
@@ -90,12 +90,18 @@ DrawPad::DrawPad(QWidget* parent, const char* name)
     thumbnailViewAction->addTo(toolsPopupMenu);
     
     QAction* pageInformationAction = new QAction(tr("Page Information"), tr("Page Information..."), 0, this);
     connect(pageInformationAction, SIGNAL(activated()), this, SLOT(pageInformation()));
     pageInformationAction->addTo(toolsPopupMenu);
 
+    toolsPopupMenu->insertSeparator();
+
+    m_pAntiAliasingAction = new QAction(tr("Anti-Aliasing"), QString::null, 0, this);
+    m_pAntiAliasingAction->setToggleAction(true);
+    m_pAntiAliasingAction->addTo(toolsPopupMenu);
+
     menuBar->insertItem(tr("Tools"), toolsPopupMenu);
 
     // init page toolbar
 
     QPEToolBar* pageToolBar = new QPEToolBar(this);
 
@@ -272,12 +278,17 @@ DrawPad::~DrawPad()
     if (file.open(IO_WriteOnly)) {
         m_pDrawPadCanvas->save(&file);
         file.close();
     }
 }
 
+bool DrawPad::antiAliasing()
+{
+    return (m_pAntiAliasingAction->isOn());
+}
+
 void DrawPad::newPage()
 {
     QRect rect = m_pDrawPadCanvas->contentsRect();
 
     NewPageDialog newPageDialog(rect.width(), rect.height(), m_pen.color(), m_brush.color(), this);
 
diff --git a/noncore/graphics/drawpad/drawpad.h b/noncore/graphics/drawpad/drawpad.h
index ce62802..8e29c61 100644
--- a/noncore/graphics/drawpad/drawpad.h
+++ b/noncore/graphics/drawpad/drawpad.h
@@ -35,12 +35,14 @@ public:
     ~DrawPad();
 
     Tool* tool() { return m_pTool; }
     QPen pen() { return m_pen; }
     QBrush brush() { return m_brush; }
 
+    bool antiAliasing();
+
 private slots:
     void newPage();
     void clearPage();
     void deletePage();
 
     void setPointTool();
@@ -71,12 +73,14 @@ private:
     DrawPadCanvas* m_pDrawPadCanvas;
 
     Tool* m_pTool;
     QPen m_pen;
     QBrush m_brush;
 
+    QAction* m_pAntiAliasingAction;
+
     QAction* m_pUndoAction;
     QAction* m_pRedoAction;
 
     QAction* m_pFirstPageAction;
     QAction* m_pPreviousPageAction;
     QAction* m_pNextPageAction;
diff --git a/noncore/graphics/drawpad/ellipsetool.cpp b/noncore/graphics/drawpad/ellipsetool.cpp
index 733bade..0cdb731 100644
--- a/noncore/graphics/drawpad/ellipsetool.cpp
+++ b/noncore/graphics/drawpad/ellipsetool.cpp
@@ -29,13 +29,15 @@ EllipseTool::~EllipseTool()
 }
 
 void EllipseTool::drawFinalShape(QPainter& p)
 {
     p.setRasterOp(Qt::NotROP);
     p.drawRect(QRect(m_polyline[2], m_polyline[0]));
+    p.setRasterOp(Qt::CopyROP);
 
+    if (m_pDrawPad->antiAliasing()) {
     QRect r = m_polyline.boundingRect();
     r = r.normalize();
     r.setLeft(r.left() - m_pDrawPad->pen().width());
     r.setTop(r.top() - m_pDrawPad->pen().width());
     r.setRight(r.right() + m_pDrawPad->pen().width());
     r.setBottom(r.bottom() + m_pDrawPad->pen().width());
@@ -61,14 +63,17 @@ void EllipseTool::drawFinalShape(QPainter& p)
     bigAreaPainter.end();
 
     bigAreaImage = bigAreaPixmap.convertToImage();
     areaImage = bigAreaImage.smoothScale(bigAreaImage.width() / 3, bigAreaImage.height() / 3);
     areaPixmap.convertFromImage(areaImage);
 
-    p.setRasterOp(Qt::CopyROP);
     p.drawPixmap(r.x(), r.y(), areaPixmap);
+    } else {
+        p.setPen(m_pDrawPad->pen());
+        p.drawEllipse(QRect(m_polyline[2], m_polyline[0]));
+    }
 }
 
 void EllipseTool::drawTemporaryShape(QPainter& p)
 {
     p.setRasterOp(Qt::NotROP);
     p.drawRect(QRect(m_polyline[2], m_polyline[1]));
diff --git a/noncore/graphics/drawpad/filledellipsetool.cpp b/noncore/graphics/drawpad/filledellipsetool.cpp
index 2f7ec8f..6b5bbc6 100644
--- a/noncore/graphics/drawpad/filledellipsetool.cpp
+++ b/noncore/graphics/drawpad/filledellipsetool.cpp
@@ -29,13 +29,15 @@ FilledEllipseTool::~FilledEllipseTool()
 }
 
 void FilledEllipseTool::drawFinalShape(QPainter& p)
 {
     p.setRasterOp(Qt::NotROP);
     p.drawRect(QRect(m_polyline[2], m_polyline[0]));
+    p.setRasterOp(Qt::CopyROP);
 
+    if (m_pDrawPad->antiAliasing()) {
     QRect r = m_polyline.boundingRect();
     r = r.normalize();
     r.setLeft(r.left() - m_pDrawPad->pen().width());
     r.setTop(r.top() - m_pDrawPad->pen().width());
     r.setRight(r.right() + m_pDrawPad->pen().width());
     r.setBottom(r.bottom() + m_pDrawPad->pen().width());
@@ -62,14 +64,18 @@ void FilledEllipseTool::drawFinalShape(QPainter& p)
     bigAreaPainter.end();
 
     bigAreaImage = bigAreaPixmap.convertToImage();
     areaImage = bigAreaImage.smoothScale(bigAreaImage.width() / 3, bigAreaImage.height() / 3);
     areaPixmap.convertFromImage(areaImage);
 
-    p.setRasterOp(Qt::CopyROP);
     p.drawPixmap(r.x(), r.y(), areaPixmap);
+    } else {
+        p.setPen(m_pDrawPad->pen());
+        p.setBrush(m_pDrawPad->brush());
+        p.drawEllipse(QRect(m_polyline[2], m_polyline[0]));
+    }
 }
 
 void FilledEllipseTool::drawTemporaryShape(QPainter& p)
 {
     p.setRasterOp(Qt::NotROP);
     p.drawRect(QRect(m_polyline[2], m_polyline[1]));
diff --git a/noncore/graphics/drawpad/linetool.cpp b/noncore/graphics/drawpad/linetool.cpp
index 99cd6de..b6baa2a 100644
--- a/noncore/graphics/drawpad/linetool.cpp
+++ b/noncore/graphics/drawpad/linetool.cpp
@@ -29,13 +29,15 @@ LineTool::~LineTool()
 }
 
 void LineTool::drawFinalShape(QPainter& p)
 {
     p.setRasterOp(Qt::NotROP);
     p.drawLine(m_polyline[2], m_polyline[0]);
+    p.setRasterOp(Qt::CopyROP);
 
+    if (m_pDrawPad->antiAliasing()) {
     QRect r = m_polyline.boundingRect();
     r = r.normalize();
     r.setLeft(r.left() - m_pDrawPad->pen().width());
     r.setTop(r.top() - m_pDrawPad->pen().width());
     r.setRight(r.right() + m_pDrawPad->pen().width());
     r.setBottom(r.bottom() + m_pDrawPad->pen().width());
@@ -62,14 +64,17 @@ void LineTool::drawFinalShape(QPainter& p)
     bigAreaPainter.end();
 
     bigAreaImage = bigAreaPixmap.convertToImage();
     areaImage = bigAreaImage.smoothScale(bigAreaImage.width() / 3, bigAreaImage.height() / 3);
     areaPixmap.convertFromImage(areaImage);
 
-    p.setRasterOp(Qt::CopyROP);
     p.drawPixmap(r.x(), r.y(), areaPixmap);
+    } else {
+        p.setPen(m_pDrawPad->pen());
+        p.drawLine(m_polyline[2], m_polyline[0]);
+    }
 }
 
 void LineTool::drawTemporaryShape(QPainter& p)
 {
     p.setRasterOp(Qt::NotROP);
     p.drawLine(m_polyline[2], m_polyline[1]);
diff --git a/noncore/graphics/drawpad/pointtool.cpp b/noncore/graphics/drawpad/pointtool.cpp
index 22bb089..a4f846e 100644
--- a/noncore/graphics/drawpad/pointtool.cpp
+++ b/noncore/graphics/drawpad/pointtool.cpp
@@ -50,22 +50,23 @@ void PointTool::mouseMoveEvent(QMouseEvent* e)
 {
     if (m_mousePressed) {
         m_polyline[2] = m_polyline[1];
         m_polyline[1] = m_polyline[0];
         m_polyline[0] = e->pos();
 
-        QPainter painter;
-        painter.begin(m_pDrawPadCanvas->currentPage());
-
         QRect r = m_polyline.boundingRect();
         r = r.normalize();
         r.setLeft(r.left() - m_pDrawPad->pen().width());
         r.setTop(r.top() - m_pDrawPad->pen().width());
         r.setRight(r.right() + m_pDrawPad->pen().width());
         r.setBottom(r.bottom() + m_pDrawPad->pen().width());
 
+        QPainter painter;
+        painter.begin(m_pDrawPadCanvas->currentPage());
+
+        if (m_pDrawPad->antiAliasing()) {
         QPixmap areaPixmap(r.width(), r.height());
         bitBlt(&areaPixmap, QPoint(0, 0), painter.device(), r);
 
         QImage areaImage = areaPixmap.convertToImage();
         QImage bigAreaImage = areaImage.smoothScale(areaImage.width() * 3, areaImage.height() * 3);
 
@@ -89,12 +90,17 @@ void PointTool::mouseMoveEvent(QMouseEvent* e)
 
         bigAreaImage = bigAreaPixmap.convertToImage();
         areaImage = bigAreaImage.smoothScale(bigAreaImage.width() / 3, bigAreaImage.height() / 3);
         areaPixmap.convertFromImage(areaImage);
 
         painter.drawPixmap(r.x(), r.y(), areaPixmap);
+        } else {
+            painter.setPen(m_pDrawPad->pen());
+            painter.drawPolyline(m_polyline);
+        }
+
         painter.end();
 
         QRect viewportRect(m_pDrawPadCanvas->contentsToViewport(r.topLeft()),
                            m_pDrawPadCanvas->contentsToViewport(r.bottomRight()));
 
         bitBlt(m_pDrawPadCanvas->viewport(), viewportRect.x(), viewportRect.y(),