summaryrefslogtreecommitdiff
authorwaspe <waspe>2003-11-27 17:01:30 (UTC)
committer waspe <waspe>2003-11-27 17:01:30 (UTC)
commitbca32c26da3baf0762be9b8b99c4fe0d4f3074f6 (patch) (unidiff)
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
@@ -128,27 +128,30 @@ OColorPopupMenu::OColorPopupMenu( const QColor& color, QWidget* parent, const ch
128 addColor(QColor(255, 0, 255), 3, 4); 128 addColor(QColor(255, 0, 255), 3, 4);
129 addColor(QColor(255, 0, 128), 3, 5); 129 addColor(QColor(255, 0, 128), 3, 5);
130 130
131 addColor(QColor(0, 128, 128), 4, 0); 131 addColor(QColor(0, 128, 128), 4, 0);
132 addColor(QColor(0, 64, 128), 4, 1); 132 addColor(QColor(0, 64, 128), 4, 1);
133 addColor(QColor(0, 0, 128), 4, 2); 133 addColor(QColor(0, 0, 128), 4, 2);
134 addColor(QColor(64, 0, 128), 4, 3); 134 addColor(QColor(64, 0, 128), 4, 3);
135 addColor(QColor(128, 0, 128), 4, 4); 135 addColor(QColor(128, 0, 128), 4, 4);
136 addColor(QColor(128, 0, 64), 4, 5); 136 addColor(QColor(128, 0, 64), 4, 5);
137 137
138 insertItem( colorPanel ); 138 insertItem( colorPanel );
139 insertSeparator(); 139 insertSeparator();
140 insertItem(tr("More"),this,SLOT( moreColorClicked()));
141 /*
140 QAction* chooseColorAction = new QAction( tr( "More" ), tr( "More..." ), 0, colorPanel, "More" ); 142 QAction* chooseColorAction = new QAction( tr( "More" ), tr( "More..." ), 0, colorPanel, "More" );
141 connect( chooseColorAction, SIGNAL( activated() ), this, SLOT( moreColorClicked() ) ); 143 connect( chooseColorAction, SIGNAL( activated() ), this, SLOT( moreColorClicked() ) );
142 chooseColorAction->addTo( this ); 144 chooseColorAction->addTo( this );
145 */
143 activateItemAt( 0 ); 146 activateItemAt( 0 );
144} 147}
145 148
146OColorPopupMenu::~OColorPopupMenu() 149OColorPopupMenu::~OColorPopupMenu()
147{ 150{
148} 151}
149 152
150void OColorPopupMenu::addColor( const QColor& color, int row, int col ) 153void OColorPopupMenu::addColor( const QColor& color, int row, int col )
151{ 154{
152 OColorPanelButton* panelButton = new OColorPanelButton( color, colorPanel ); 155 OColorPanelButton* panelButton = new OColorPanelButton( color, colorPanel );
153 connect( panelButton, SIGNAL( selected( const QColor& ) ), this, SLOT( buttonSelected( const QColor& ) ) ); 156 connect( panelButton, SIGNAL( selected( const QColor& ) ), this, SLOT( buttonSelected( const QColor& ) ) );
154 colorLayout->addWidget( panelButton, row, col ); 157 colorLayout->addWidget( panelButton, row, col );