Use new ColorPopupMenu and ColorDialog found in libopie

3 files changed, 43 insertions, 48 deletions

diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp
index 7e6fc53..77fee98 100644
--- a/noncore/graphics/drawpad/drawpad.cpp
+++ b/noncore/graphics/drawpad/drawpad.cpp
@@ -10,14 +10,14 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "drawpad.h"
 
-#include "colordialog.h"
-#include "colorpanel.h"
+//#include "colordialog.h"
+//#include "colorpanel.h"
 #include "drawpadcanvas.h"
 #include "ellipsetool.h"
 #include "erasetool.h"
 #include "exportdialog.h"
 #include "filledellipsetool.h"
 #include "filledrectangletool.h"
@@ -30,12 +30,14 @@
 
 #include <qpe/applnk.h>
 #include <qpe/global.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
+#include <opie/colordialog.h>
+#include <opie/colorpopupmenu.h>
 
 #include <qaction.h>
 #include <qfile.h>
 #include <qpainter.h>
 #include <qspinbox.h>
 #include <qtoolbutton.h>
@@ -213,50 +215,61 @@ DrawPad::DrawPad(QWidget* parent, const char* name)
     penWidthSpinBox->setValue(1);
     penWidthSpinBox->setFocusPolicy(QWidget::NoFocus);
 
     m_pPenColorToolButton = new QToolButton(drawParametersToolBar);
     m_pPenColorToolButton->setPixmap(Resource::loadPixmap("drawpad/pencolor.png"));
 
-    QPopupMenu* penColorPopupMenu = new QPopupMenu(m_pPenColorToolButton);
+    ColorPopupMenu* colorPopupMenu = new ColorPopupMenu( Qt::black, m_pPenColorToolButton );
+    m_pPenColorToolButton->setPopup( colorPopupMenu );
+    m_pPenColorToolButton->setPopupDelay( 0 );
+    QToolTip::add(m_pPenColorToolButton, tr("Pen Color"));
+    connect( colorPopupMenu, SIGNAL( colorSelected( const QColor& ) ), this, SLOT( changePenColor( const QColor& ) ) );
 
-    ColorPanel* penColorPanel = new ColorPanel(penColorPopupMenu);
-    connect(penColorPanel, SIGNAL(colorSelected(const QColor&)), this, SLOT(changePenColor(const QColor&)));
+//    QPopupMenu* penColorPopupMenu = new QPopupMenu(m_pPenColorToolButton);
 
-    penColorPopupMenu->insertItem(penColorPanel);
-    penColorPopupMenu->insertSeparator();
+//    ColorPanel* penColorPanel = new ColorPanel(penColorPopupMenu);
+//    connect(penColorPanel, SIGNAL(colorSelected(const QColor&)), this, SLOT(changePenColor(const QColor&)));
 
-    QAction* choosePenColorAction = new QAction(tr("More"), tr("More..."), 0, this);
-    connect(choosePenColorAction, SIGNAL(activated()), this, SLOT(choosePenColor()));
-    choosePenColorAction->addTo(penColorPopupMenu);
+//    penColorPopupMenu->insertItem(penColorPanel);
+//    penColorPopupMenu->insertSeparator();
 
-    QToolTip::add(m_pPenColorToolButton, tr("Pen Color"));
-    m_pPenColorToolButton->setPopup(penColorPopupMenu);
-    m_pPenColorToolButton->setPopupDelay(0);
+//    QAction* choosePenColorAction = new QAction(tr("More"), tr("More..."), 0, this);
+//    connect(choosePenColorAction, SIGNAL(activated()), this, SLOT(choosePenColor()));
+//    choosePenColorAction->addTo(penColorPopupMenu);
 
-    penColorPanel->buttonSelected(Qt::black);
+//    m_pPenColorToolButton->setPopup(colorPopupMenu);
+//    m_pPenColorToolButton->setPopupDelay(0);
+
+//    penColorPanel->buttonSelected(Qt::black);
 
     m_pBrushColorToolButton = new QToolButton(drawParametersToolBar);
     m_pBrushColorToolButton->setPixmap(Resource::loadPixmap("drawpad/brushcolor.png"));
 
-    QPopupMenu* brushColorPopupMenu = new QPopupMenu(m_pBrushColorToolButton);
 
-    ColorPanel* brushColorPanel = new ColorPanel(brushColorPopupMenu);
-    connect(brushColorPanel, SIGNAL(colorSelected(const QColor&)), this, SLOT(changeBrushColor(const QColor&)));
+    colorPopupMenu = new ColorPopupMenu( Qt::white, m_pBrushColorToolButton );
+    m_pBrushColorToolButton->setPopup( colorPopupMenu );
+    m_pBrushColorToolButton->setPopupDelay( 0 );
+    QToolTip::add(m_pBrushColorToolButton, tr("Fill Color"));
+    connect( colorPopupMenu, SIGNAL( colorSelected( const QColor& ) ), this, SLOT( changeeBrushColor( const QColor& ) ) );
 
-    brushColorPopupMenu->insertItem(brushColorPanel);
-    brushColorPopupMenu->insertSeparator();
+//    QPopupMenu* brushColorPopupMenu = new QPopupMenu(m_pBrushColorToolButton);
 
-    QAction* chooseBrushColorAction = new QAction(tr("More"), tr("More..."), 0, this);
-    connect(chooseBrushColorAction, SIGNAL(activated()), this, SLOT(chooseBrushColor()));
-    chooseBrushColorAction->addTo(brushColorPopupMenu);
+//    ColorPanel* brushColorPanel = new ColorPanel(brushColorPopupMenu);
+//    connect(brushColorPanel, SIGNAL(colorSelected(const QColor&)), this, SLOT(changeBrushColor(const QColor&)));
 
-    QToolTip::add(m_pBrushColorToolButton, tr("Fill Color"));
-    m_pBrushColorToolButton->setPopup(brushColorPopupMenu);
-    m_pBrushColorToolButton->setPopupDelay(0);
+//    brushColorPopupMenu->insertItem(brushColorPanel);
+//    brushColorPopupMenu->insertSeparator();
+
+//    QAction* chooseBrushColorAction = new QAction(tr("More"), tr("More..."), 0, this);
+//    connect(chooseBrushColorAction, SIGNAL(activated()), this, SLOT(chooseBrushColor()));
+//    chooseBrushColorAction->addTo(brushColorPopupMenu);
+
+//    m_pBrushColorToolButton->setPopup(brushColorPopupMenu);
+//    m_pBrushColorToolButton->setPopupDelay(0);
 
-    brushColorPanel->buttonSelected(Qt::white);
+//    brushColorPanel->buttonSelected(Qt::white);
 
     // init pages
 
     QFile file(Global::applicationFileName("drawpad", "drawpad.xml"));
 
     if (file.open(IO_ReadOnly)) {
@@ -483,24 +496,12 @@ void DrawPad::changeBrushColor(const QColor& color)
     painter.fillRect(QRect(0, 12, 14, 2), m_brush.color());
     painter.end();
  
     m_pBrushColorToolButton->popup()->hide();
 }
 
-void DrawPad::choosePenColor()
-{
-    QColor newPenColor = QColorDialog::getColor(m_pen.color());
-    changePenColor(newPenColor);
-}
-
-void DrawPad::chooseBrushColor()
-{
-    QColor newBrushColor = QColorDialog::getColor(m_brush.color());
-    changeBrushColor(newBrushColor);
-}
-
 void DrawPad::updateUndoRedoToolButtons()
 {
     m_pUndoAction->setEnabled(m_pDrawPadCanvas->undoEnabled());
     m_pRedoAction->setEnabled(m_pDrawPadCanvas->redoEnabled());
 }
 
diff --git a/noncore/graphics/drawpad/drawpad.h b/noncore/graphics/drawpad/drawpad.h
index e4fd831..0dcd5c9 100644
--- a/noncore/graphics/drawpad/drawpad.h
+++ b/noncore/graphics/drawpad/drawpad.h
@@ -24,13 +24,13 @@ class Tool;
 class QAction;
 class QColor;
 class QToolButton;
 class QWidgetStack;
 
 class DrawPad : public QMainWindow
-{ 
+{
     Q_OBJECT
 
 public:
     DrawPad(QWidget* parent = 0, const char* name = 0);
     ~DrawPad();
 
@@ -49,14 +49,12 @@ private slots:
     void setFillTool();
     void setEraseTool();
 
     void changePenWidth(int value);
     void changePenColor(const QColor& color);
     void changeBrushColor(const QColor& color);
-    void choosePenColor();
-    void chooseBrushColor();
 
     void updateUndoRedoToolButtons();
     void updateNavigationToolButtons();
     void updateCaption();
 
     void importPage();
diff --git a/noncore/graphics/drawpad/drawpad.pro b/noncore/graphics/drawpad/drawpad.pro
index 00eb00d..3b120c9 100644
--- a/noncore/graphics/drawpad/drawpad.pro
+++ b/noncore/graphics/drawpad/drawpad.pro
@@ -1,11 +1,9 @@
 TEMPLATE	= app
 CONFIG		= qt warn_on release
-HEADERS		= colordialog.h \
-		  colorpanel.h \
-		  drawpad.h \
+HEADERS		= drawpad.h \
 		  drawpadcanvas.h \
 		  ellipsetool.h \
 		  erasetool.h \
 		  exportdialog.h \
 		  filltool.h \
 		  filledellipsetool.h \
@@ -15,15 +13,13 @@ HEADERS		= colordialog.h \
 		  newpagedialog.h \
 		  pointtool.h \
 		  rectangletool.h \
 		  shapetool.h \
 		  texttool.h \
 		  tool.h
-SOURCES		= colordialog.cpp \
-		  colorpanel.cpp \
-		  drawpad.cpp \
+SOURCES		= drawpad.cpp \
 		  drawpadcanvas.cpp \
 		  ellipsetool.cpp \
 		  erasetool.cpp \
 		  exportdialog.cpp \
 		  filltool.cpp \
 		  filledellipsetool.cpp \
@@ -37,13 +33,13 @@ SOURCES		= colordialog.cpp \
 		  shapetool.cpp \
 		  texttool.cpp \
 		  tool.cpp
 INCLUDEPATH	+= $(OPIEDIR)/include \
 		  $(QTDIR)/src/3rdparty/zlib
 DEPENDPATH	+= $(OPIEDIR)/include
-LIBS		+= -lqpe
+LIBS		+= -lqpe -lopie
 DESTDIR		= $(OPIEDIR)/bin
 TARGET		= drawpad
 
 TRANSLATIONS    = ../../i18n/pt_BR/drawpad.ts
 TRANSLATIONS   += ../../i18n/de/drawpad.ts
 TRANSLATIONS   += ../../i18n/en/drawpad.ts