Diffstat (limited to 'noncore/graphics/drawpad/drawpad.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/graphics/drawpad/drawpad.cpp | 77 |
1 files changed, 39 insertions, 38 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 @@ -13,8 +13,8 @@ #include "drawpad.h" -#include "colordialog.h" -#include "colorpanel.h" +//#include "colordialog.h" +//#include "colorpanel.h" #include "drawpadcanvas.h" #include "ellipsetool.h" #include "erasetool.h" @@ -33,6 +33,8 @@ #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> @@ -216,44 +218,55 @@ DrawPad::DrawPad(QWidget* parent, const char* name) 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 @@ -486,18 +499,6 @@ void DrawPad::changeBrushColor(const QColor& color) 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()); |