summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/graphics/drawpad/drawpad.cpp77
-rw-r--r--noncore/graphics/drawpad/drawpad.h2
-rw-r--r--noncore/graphics/drawpad/drawpad.pro10
3 files changed, 42 insertions, 47 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
@@ -14,6 +14,6 @@
#include "drawpad.h"
-#include "colordialog.h"
-#include "colorpanel.h"
+//#include "colordialog.h"
+//#include "colorpanel.h"
#include "drawpadcanvas.h"
#include "ellipsetool.h"
@@ -34,4 +34,6 @@
#include <qpe/qpetoolbar.h>
#include <qpe/resource.h>
+#include <opie/colordialog.h>
+#include <opie/colorpopupmenu.h>
#include <qaction.h>
@@ -217,42 +219,53 @@ DrawPad::DrawPad(QWidget* parent, const char* name)
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);
+
+// m_pPenColorToolButton->setPopup(colorPopupMenu);
+// m_pPenColorToolButton->setPopupDelay(0);
- penColorPanel->buttonSelected(Qt::black);
+// 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();
- brushColorPanel->buttonSelected(Qt::white);
+// 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);
// init pages
@@ -487,16 +500,4 @@ void DrawPad::changeBrushColor(const QColor& color)
}
-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()
{
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
@@ -53,6 +53,4 @@ private slots:
void changePenColor(const QColor& color);
void changeBrushColor(const QColor& color);
- void choosePenColor();
- void chooseBrushColor();
void updateUndoRedoToolButtons();
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,7 +1,5 @@
TEMPLATE = app
CONFIG = qt warn_on release
-HEADERS = colordialog.h \
- colorpanel.h \
- drawpad.h \
+HEADERS = drawpad.h \
drawpadcanvas.h \
ellipsetool.h \
@@ -19,7 +17,5 @@ HEADERS = colordialog.h \
texttool.h \
tool.h
-SOURCES = colordialog.cpp \
- colorpanel.cpp \
- drawpad.cpp \
+SOURCES = drawpad.cpp \
drawpadcanvas.cpp \
ellipsetool.cpp \
@@ -41,5 +37,5 @@ INCLUDEPATH += $(OPIEDIR)/include \
$(QTDIR)/src/3rdparty/zlib
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe
+LIBS += -lqpe -lopie
DESTDIR = $(OPIEDIR)/bin
TARGET = drawpad