| -rw-r--r-- | noncore/graphics/drawpad/drawpad.cpp | 58 |
1 files changed, 14 insertions, 44 deletions
diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp index 77fee98..74787e5 100644 --- a/noncore/graphics/drawpad/drawpad.cpp +++ b/noncore/graphics/drawpad/drawpad.cpp @@ -4,46 +4,45 @@ * * * (C) 2002 by S. Prud'homme <prudhomme@laposte.net> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #include "drawpad.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" #include "filltool.h" #include "importdialog.h" #include "linetool.h" #include "pointtool.h" #include "rectangletool.h" #include "texttool.h" +#include <opie/colordialog.h> +#include <opie/colorpopupmenu.h> + #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> #include <qtooltip.h> DrawPad::DrawPad(QWidget* parent, const char* name) : QMainWindow(parent, name) { // init members @@ -209,73 +208,44 @@ DrawPad::DrawPad(QWidget* parent, const char* name) QPEToolBar* drawParametersToolBar = new QPEToolBar(this); QSpinBox* penWidthSpinBox = new QSpinBox(1, 9, 1, drawParametersToolBar); connect(penWidthSpinBox, SIGNAL(valueChanged(int)), this, SLOT(changePenWidth(int))); QToolTip::add(penWidthSpinBox, tr("Pen Width")); penWidthSpinBox->setValue(1); penWidthSpinBox->setFocusPolicy(QWidget::NoFocus); m_pPenColorToolButton = new QToolButton(drawParametersToolBar); m_pPenColorToolButton->setPixmap(Resource::loadPixmap("drawpad/pencolor.png")); - 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& ) ) ); - -// QPopupMenu* penColorPopupMenu = new QPopupMenu(m_pPenColorToolButton); - -// ColorPanel* penColorPanel = new ColorPanel(penColorPopupMenu); -// connect(penColorPanel, SIGNAL(colorSelected(const QColor&)), this, SLOT(changePenColor(const QColor&))); + ColorPopupMenu* penColorPopupMenu = new ColorPopupMenu(Qt::black, m_pPenColorToolButton); + connect(penColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this, SLOT(changePenColor(const QColor&))); -// penColorPopupMenu->insertItem(penColorPanel); -// penColorPopupMenu->insertSeparator(); - -// 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); + QToolTip::add(m_pPenColorToolButton, tr("Pen Color")); + m_pPenColorToolButton->setPopup(penColorPopupMenu); + m_pPenColorToolButton->setPopupDelay(0); -// penColorPanel->buttonSelected(Qt::black); + changePenColor(Qt::black); m_pBrushColorToolButton = new QToolButton(drawParametersToolBar); m_pBrushColorToolButton->setPixmap(Resource::loadPixmap("drawpad/brushcolor.png")); + ColorPopupMenu* brushColorPopupMenu = new ColorPopupMenu(Qt::white, m_pBrushColorToolButton); + connect(brushColorPopupMenu, 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& ) ) ); - -// QPopupMenu* brushColorPopupMenu = new QPopupMenu(m_pBrushColorToolButton); - -// ColorPanel* brushColorPanel = new ColorPanel(brushColorPopupMenu); -// connect(brushColorPanel, SIGNAL(colorSelected(const QColor&)), this, SLOT(changeBrushColor(const QColor&))); - -// 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); + m_pBrushColorToolButton->setPopup(brushColorPopupMenu); + m_pBrushColorToolButton->setPopupDelay(0); -// brushColorPanel->buttonSelected(Qt::white); + changeBrushColor(Qt::white); // init pages QFile file(Global::applicationFileName("drawpad", "drawpad.xml")); if (file.open(IO_ReadOnly)) { m_pDrawPadCanvas->load(&file); file.close(); } else { m_pDrawPadCanvas->initialPage(); } } |