summaryrefslogtreecommitdiff
authorwaspe <waspe>2003-11-27 17:01:30 (UTC)
committer waspe <waspe>2003-11-27 17:01:30 (UTC)
commitbca32c26da3baf0762be9b8b99c4fe0d4f3074f6 (patch) (side-by-side diff)
treeca38f8d72ff9f44d995b5efa62c669c653cebcbd
parent015b7fb8b90089e762f0e15c0857d657b5b2092a (diff)
downloadopie-bca32c26da3baf0762be9b8b99c4fe0d4f3074f6.zip
opie-bca32c26da3baf0762be9b8b99c4fe0d4f3074f6.tar.gz
opie-bca32c26da3baf0762be9b8b99c4fe0d4f3074f6.tar.bz2
eliminated drawpad segfault
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie/colorpopupmenu.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/libopie/colorpopupmenu.cpp b/libopie/colorpopupmenu.cpp
index dac10e9..5a8d77e 100644
--- a/libopie/colorpopupmenu.cpp
+++ b/libopie/colorpopupmenu.cpp
@@ -124,35 +124,38 @@ OColorPopupMenu::OColorPopupMenu( const QColor& color, QWidget* parent, const ch
addColor(QColor(0, 255, 255), 3, 0);
addColor(QColor(0, 128, 255), 3, 1);
addColor(QColor(0, 0, 255), 3, 2);
addColor(QColor(128, 0, 255), 3, 3);
addColor(QColor(255, 0, 255), 3, 4);
addColor(QColor(255, 0, 128), 3, 5);
addColor(QColor(0, 128, 128), 4, 0);
addColor(QColor(0, 64, 128), 4, 1);
addColor(QColor(0, 0, 128), 4, 2);
addColor(QColor(64, 0, 128), 4, 3);
addColor(QColor(128, 0, 128), 4, 4);
addColor(QColor(128, 0, 64), 4, 5);
insertItem( colorPanel );
insertSeparator();
+ insertItem(tr("More"),this,SLOT( moreColorClicked()));
+ /*
QAction* chooseColorAction = new QAction( tr( "More" ), tr( "More..." ), 0, colorPanel, "More" );
connect( chooseColorAction, SIGNAL( activated() ), this, SLOT( moreColorClicked() ) );
chooseColorAction->addTo( this );
+ */
activateItemAt( 0 );
}
OColorPopupMenu::~OColorPopupMenu()
{
}
void OColorPopupMenu::addColor( const QColor& color, int row, int col )
{
OColorPanelButton* panelButton = new OColorPanelButton( color, colorPanel );
connect( panelButton, SIGNAL( selected( const QColor& ) ), this, SLOT( buttonSelected( const QColor& ) ) );
colorLayout->addWidget( panelButton, row, col );
}
void OColorPopupMenu::buttonSelected( const QColor& color )
{