summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libqtaux/libqtaux.pro1
-rw-r--r--libqtaux/qcolordialog.cpp838
-rw-r--r--libqtaux/qcolordialog.h315
3 files changed, 590 insertions, 564 deletions
diff --git a/libqtaux/libqtaux.pro b/libqtaux/libqtaux.pro
index 56ccc65..a1440e3 100644
--- a/libqtaux/libqtaux.pro
+++ b/libqtaux/libqtaux.pro
@@ -1,25 +1,24 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qte warn_on debug 2CONFIG += qte warn_on debug
3 3
4HEADERS = qcolordialog.h \ 4HEADERS = qcolordialog.h \
5 qsplitter.h \ 5 qsplitter.h \
6 qinputdialog.h \ 6 qinputdialog.h \
7 \ 7 \
8 ocolorpopupmenu.h \ 8 ocolorpopupmenu.h \
9 ocolorbutton.h 9 ocolorbutton.h
10 10
11 11
12SOURCES = qcolordialog.cpp \ 12SOURCES = qcolordialog.cpp \
13 qsplitter.cpp \ 13 qsplitter.cpp \
14 qinputdialog.cpp \ 14 qinputdialog.cpp \
15 \ 15 \
16 ocolorpopupmenu.cpp \ 16 ocolorpopupmenu.cpp \
17 ocolorbutton.cpp 17 ocolorbutton.cpp
18 18
19TARGET = qtaux2 19TARGET = qtaux2
20INCLUDEPATH += $(OPIEDIR)/include 20INCLUDEPATH += $(OPIEDIR)/include
21DESTDIR = $(OPIEDIR)/lib 21DESTDIR = $(OPIEDIR)/lib
22INTERFACES =
23 22
24 23
25include ( $(OPIEDIR)/include.pro ) 24include ( $(OPIEDIR)/include.pro )
diff --git a/libqtaux/qcolordialog.cpp b/libqtaux/qcolordialog.cpp
index 1574841..b960b04 100644
--- a/libqtaux/qcolordialog.cpp
+++ b/libqtaux/qcolordialog.cpp
@@ -16,855 +16,1163 @@
16** This file may be distributed and/or modified under the terms of the 16** This file may be distributed and/or modified under the terms of the
17** GNU General Public License version 2 as published by the Free Software 17** GNU General Public License version 2 as published by the Free Software
18** Foundation and appearing in the file LICENSE.GPL included in the 18** Foundation and appearing in the file LICENSE.GPL included in the
19** packaging of this file. 19** packaging of this file.
20** 20**
21** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition 21** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
22** licenses may use this file in accordance with the Qt Commercial License 22** licenses may use this file in accordance with the Qt Commercial License
23** Agreement provided with the Software. 23** Agreement provided with the Software.
24** 24**
25** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 25** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
26** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 26** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
27** 27**
28** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for 28** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
29** information about Qt Commercial License Agreements. 29** information about Qt Commercial License Agreements.
30** See http://www.trolltech.com/qpl/ for QPL licensing information. 30** See http://www.trolltech.com/qpl/ for QPL licensing information.
31** See http://www.trolltech.com/gpl/ for GPL licensing information. 31** See http://www.trolltech.com/gpl/ for GPL licensing information.
32** 32**
33** Contact info@trolltech.com if any conditions of this licensing are 33** Contact info@trolltech.com if any conditions of this licensing are
34** not clear to you. 34** not clear to you.
35** 35**
36**********************************************************************/ 36**********************************************************************/
37 37
38#include "qcolordialog.h" 38#include "qcolordialog.h"
39 39
40#include <qpainter.h> 40#include "qpainter.h"
41#include <qlayout.h> 41#include "qlayout.h"
42#include <qpushbutton.h> 42#include "qlabel.h"
43#include <qimage.h> 43#include "qpushbutton.h"
44#include <qpixmap.h> 44#include "qlineedit.h"
45#include <qdrawutil.h> 45#include "qimage.h"
46#include <qdragobject.h> 46#include "qpixmap.h"
47#include <qapplication.h> 47#include "qdrawutil.h"
48#include <qdragobject.h> 48#include "qvalidator.h"
49#include "qdragobject.h"
50#include "qapplication.h"
51#include "qdragobject.h"
49 52
50//////////// QWellArray BEGIN 53//////////// QWellArray BEGIN
51 54
52#include <qobjectdict.h> 55#include "qobjectdict.h"
53 56
54// 57//
55// W A R N I N G 58// W A R N I N G
56// ------------- 59// -------------
57// 60//
58// This file is not part of the Qt API. It exists for the convenience 61// This file is not part of the Qt API. It exists for the convenience
59// of qwellarray.cpp and qcolordialog.cpp. 62// of qwellarray.cpp and qcolordialog.cpp.
60// This header file may change from version to version without notice, 63// This header file may change from version to version without notice,
61// or even be removed. 64// or even be removed.
62// 65//
63// 66//
64 67
68
69#include "qtableview.h"
70
71
72struct QWellArrayData;
73
74class QWellArray : public QTableView
75{
76 Q_OBJECT
77 Q_PROPERTY( int numCols READ numCols )
78 Q_PROPERTY( int numRows READ numRows )
79 Q_PROPERTY( int selectedColumn READ selectedColumn )
80 Q_PROPERTY( int selectedRow READ selectedRow )
81
82public:
83 QWellArray( QWidget *parent=0, const char *name=0, bool popup = FALSE );
84
85 ~QWellArray() {}
86 QString cellContent( int row, int col ) const;
87 // ### Paul !!! virtual void setCellContent( int row, int col, const QString &);
88
89 // ##### Obsolete since not const
90 int numCols() { return nCols; }
91 int numRows() { return nRows; }
92
93 int numCols() const { return nCols; }
94 int numRows() const { return nRows; }
95
96 // ##### Obsolete since not const
97 int selectedColumn() { return selCol; }
98 int selectedRow() { return selRow; }
99
100 int selectedColumn() const { return selCol; }
101 int selectedRow() const { return selRow; }
102
103 virtual void setSelected( int row, int col );
104
105 void setCellSize( int w, int h ) { setCellWidth(w);setCellHeight( h ); }
106
107 QSize sizeHint() const;
108
109 virtual void setDimension( int rows, int cols );
110 virtual void setCellBrush( int row, int col, const QBrush & );
111 QBrush cellBrush( int row, int col );
112
113signals:
114 void selected( int row, int col );
115
116protected:
117 virtual void setCurrent( int row, int col );
118
119 virtual void drawContents( QPainter *, int row, int col, const QRect& );
120 void drawContents( QPainter * );
121
122 void paintCell( QPainter*, int row, int col );
123 void mousePressEvent( QMouseEvent* );
124 void mouseReleaseEvent( QMouseEvent* );
125 void mouseMoveEvent( QMouseEvent* );
126 void keyPressEvent( QKeyEvent* );
127 void focusInEvent( QFocusEvent* );
128 void focusOutEvent( QFocusEvent* );
129
130private:
131 int curRow;
132 int curCol;
133 int selRow;
134 int selCol;
135 int nCols;
136 int nRows;
137 bool smallStyle;
138 QWellArrayData *d;
139
140 private:// Disabled copy constructor and operator=
141#if defined(Q_DISABLE_COPY)
142 QWellArray( const QWellArray & );
143 QWellArray& operator=( const QWellArray & );
144#endif
145};
146
147
148
149// non-interface ...
150
151
152
153struct QWellArrayData {
154 QBrush *brush;
155};
156
157// NOT REVISED
158/* WARNING, NOT
159 \class QWellArray qwellarray_p.h
160 \brief ....
161
162 ....
163
164 \ingroup advanced
165*/
166
65QWellArray::QWellArray( QWidget *parent, const char * name, bool popup ) 167QWellArray::QWellArray( QWidget *parent, const char * name, bool popup )
66 : QTableView( parent, name, 168 : QTableView( parent, name,
67 popup ? (WStyle_Customize|WStyle_Tool|WStyle_NoBorder) : 0 ) 169 popup ? (WStyle_Customize|WStyle_Tool|WStyle_NoBorder) : 0 )
68{ 170{
69 d = 0; 171 d = 0;
70 setFocusPolicy( StrongFocus ); 172 setFocusPolicy( StrongFocus );
71 setBackgroundMode( PaletteButton ); 173 setBackgroundMode( PaletteButton );
72 nCols = 7; 174 nCols = 7;
73 nRows = 7; 175 nRows = 7;
74 int w = 24; // cell width 176 int w = 24; // cell width
75 int h = 21; // cell height 177 int h = 21; // cell height
76 smallStyle = popup; 178 smallStyle = popup;
77 179
78 if ( popup ) { 180 if ( popup ) {
79 w = h = 18; 181 w = h = 18;
80 if ( style() == WindowsStyle ) 182 if ( style() == WindowsStyle )
81 setFrameStyle( QFrame::WinPanel | QFrame::Raised ); 183 setFrameStyle( QFrame::WinPanel | QFrame::Raised );
82 else 184 else
83 setFrameStyle( QFrame::Panel | QFrame::Raised ); 185 setFrameStyle( QFrame::Panel | QFrame::Raised );
84 setMargin( 1 ); 186 setMargin( 1 );
85 setLineWidth( 2 ); 187 setLineWidth( 2 );
86 } 188 }
87 setNumCols( nCols ); 189 setNumCols( nCols );
88 setNumRows( nRows ); 190 setNumRows( nRows );
89 setCellWidth( w ); 191 setCellWidth( w );
90 setCellHeight( h ); 192 setCellHeight( h );
91 curCol = 0; 193 curCol = 0;
92 curRow = 0; 194 curRow = 0;
93 selCol = -1; 195 selCol = -1;
94 selRow = -1; 196 selRow = -1;
95 197
96 if ( smallStyle ) 198 if ( smallStyle )
97 setMouseTracking( TRUE ); 199 setMouseTracking( TRUE );
98 setOffset( 5 , 10 ); 200 setOffset( 5 , 10 );
99 201
100 resize( sizeHint() ); 202 resize( sizeHint() );
101 203
102} 204}
103 205
104 206
105QSize QWellArray::sizeHint() const 207QSize QWellArray::sizeHint() const
106{ 208{
107 constPolish(); 209 constPolish();
108 int f = frameWidth() * 2; 210 int f = frameWidth() * 2;
109 int w = nCols * cellWidth() + f; 211 int w = nCols * cellWidth() + f;
110 int h = nRows * cellHeight() + f; 212 int h = nRows * cellHeight() + f;
111 return QSize( w, h ); 213 return QSize( w, h );
112} 214}
113 215
114 216
115void QWellArray::paintCell( QPainter* p, int row, int col ) 217void QWellArray::paintCell( QPainter* p, int row, int col )
116{ 218{
117 int w = cellWidth( col ); // width of cell in pixels 219 int w = cellWidth( col ); // width of cell in pixels
118 int h = cellHeight( row ); // height of cell in pixels 220 int h = cellHeight( row ); // height of cell in pixels
119 int b = 1; 221 int b = 1;
120 222
121 if ( !smallStyle ) 223 if ( !smallStyle )
122 b = 3; 224 b = 3;
123 225
124 const QColorGroup & g = colorGroup(); 226 const QColorGroup & g = colorGroup();
125 p->setPen( QPen( black, 0, SolidLine ) ); 227 p->setPen( QPen( black, 0, SolidLine ) );
126 if ( !smallStyle && row ==selRow && col == selCol && 228 if ( !smallStyle && row ==selRow && col == selCol &&
127 style() != MotifStyle ) { 229 style() != MotifStyle ) {
128 int n = 2; 230 int n = 2;
129 p->drawRect( n, n, w-2*n, h-2*n ); 231 p->drawRect( n, n, w-2*n, h-2*n );
130 } 232 }
131 233
132 234
133 if ( style() == WindowsStyle ) { 235 if ( style() == WindowsStyle ) {
134 qDrawWinPanel( p, b, b , w - 2*b, h - 2*b, 236 qDrawWinPanel( p, b, b , w - 2*b, h - 2*b,
135 g, TRUE ); 237 g, TRUE );
136 b += 2; 238 b += 2;
137 } else { 239 } else {
138 if ( smallStyle ) { 240 if ( smallStyle ) {
139 qDrawShadePanel( p, b, b , w - 2*b, h - 2*b, 241 qDrawShadePanel( p, b, b , w - 2*b, h - 2*b,
140 g, TRUE, 2 ); 242 g, TRUE, 2 );
141 b += 2; 243 b += 2;
142 } else { 244 } else {
143 int t = ( row == selRow && col == selCol ) ? 2 : 0; 245 int t = ( row == selRow && col == selCol ) ? 2 : 0;
144 b -= t; 246 b -= t;
145 qDrawShadePanel( p, b, b , w - 2*b, h - 2*b, 247 qDrawShadePanel( p, b, b , w - 2*b, h - 2*b,
146 g, TRUE, 2 ); 248 g, TRUE, 2 );
147 b += 2 + t; 249 b += 2 + t;
148 } 250 }
149 } 251 }
150 252
151 253
152 if ( (row == curRow) && (col == curCol) ) { 254 if ( (row == curRow) && (col == curCol) ) {
153 if ( smallStyle ) { 255 if ( smallStyle ) {
154 p->setPen ( white ); 256 p->setPen ( white );
155 p->drawRect( 1, 1, w-2, h-2 ); 257 p->drawRect( 1, 1, w-2, h-2 );
156 p->setPen ( black ); 258 p->setPen ( black );
157 p->drawRect( 0, 0, w, h ); 259 p->drawRect( 0, 0, w, h );
158 p->drawRect( 2, 2, w-4, h-4 ); 260 p->drawRect( 2, 2, w-4, h-4 );
159 b = 3; 261 b = 3;
160 } else if ( hasFocus() ) { 262 } else if ( hasFocus() ) {
161 style().drawFocusRect(p, QRect(0,0,w,h), g ); 263 style().drawFocusRect(p, QRect(0,0,w,h), g );
162 } 264 }
163 } 265 }
164 drawContents( p, row, col, QRect(b, b, w - 2*b, h - 2*b) ); 266 drawContents( p, row, col, QRect(b, b, w - 2*b, h - 2*b) );
165} 267}
166 268
167/*! 269/*!
168 Pass-through to QTableView::drawContents() to avoid hiding. 270 Pass-through to QTableView::drawContents() to avoid hiding.
169*/ 271*/
170void QWellArray::drawContents( QPainter *p ) 272void QWellArray::drawContents( QPainter *p )
171{ 273{
172 QTableView::drawContents(p); 274 QTableView::drawContents(p);
173} 275}
174 276
175/*! 277/*!
176 Reimplement this function to change the contents of the well array. 278 Reimplement this function to change the contents of the well array.
177 */ 279 */
178void QWellArray::drawContents( QPainter *p, int row, int col, const QRect &r ) 280void QWellArray::drawContents( QPainter *p, int row, int col, const QRect &r )
179{ 281{
180 282
181 if ( d ) { 283 if ( d ) {
182 p->fillRect( r, d->brush[row*nCols+col] ); 284 p->fillRect( r, d->brush[row*nCols+col] );
183 } else { 285 } else {
184 p->fillRect( r, white ); 286 p->fillRect( r, white );
185 p->setPen( black ); 287 p->setPen( black );
186 p->drawLine( r.topLeft(), r.bottomRight() ); 288 p->drawLine( r.topLeft(), r.bottomRight() );
187 p->drawLine( r.topRight(), r.bottomLeft() ); 289 p->drawLine( r.topRight(), r.bottomLeft() );
188 } 290 }
189} 291}
190 292
191 293
192/*\reimp 294/*\reimp
193*/ 295*/
194void QWellArray::mousePressEvent( QMouseEvent* e ) 296void QWellArray::mousePressEvent( QMouseEvent* e )
195{ 297{
196 // The current cell marker is set to the cell the mouse is pressed 298 // The current cell marker is set to the cell the mouse is pressed
197 // in. 299 // in.
198 QPoint pos = e->pos(); 300 QPoint pos = e->pos();
199 setCurrent( findRow( pos.y() ), findCol( pos.x() ) ); 301 setCurrent( findRow( pos.y() ), findCol( pos.x() ) );
200} 302}
201 303
202/*\reimp 304/*\reimp
203*/ 305*/
204void QWellArray::mouseReleaseEvent( QMouseEvent* ) 306void QWellArray::mouseReleaseEvent( QMouseEvent* )
205{ 307{
206 // The current cell marker is set to the cell the mouse is clicked 308 // The current cell marker is set to the cell the mouse is clicked
207 // in. 309 // in.
208 setSelected( curRow, curCol ); 310 setSelected( curRow, curCol );
209} 311}
210 312
211 313
212/*\reimp 314/*\reimp
213*/ 315*/
214void QWellArray::mouseMoveEvent( QMouseEvent* e ) 316void QWellArray::mouseMoveEvent( QMouseEvent* e )
215{ 317{
216 // The current cell marker is set to the cell the mouse is 318 // The current cell marker is set to the cell the mouse is
217 // clicked in. 319 // clicked in.
218 if ( smallStyle ) { 320 if ( smallStyle ) {
219 QPoint pos = e->pos(); 321 QPoint pos = e->pos();
220 setCurrent( findRow( pos.y() ), findCol( pos.x() ) ); 322 setCurrent( findRow( pos.y() ), findCol( pos.x() ) );
221 } 323 }
222} 324}
223 325
224/* 326/*
225 Sets the cell currently having the focus. This is not necessarily 327 Sets the cell currently having the focus. This is not necessarily
226 the same as the currently selected cell. 328 the same as the currently selected cell.
227*/ 329*/
228 330
229void QWellArray::setCurrent( int row, int col ) 331void QWellArray::setCurrent( int row, int col )
230{ 332{
231 333
232 if ( (curRow == row) && (curCol == col) ) 334 if ( (curRow == row) && (curCol == col) )
233 return; 335 return;
234 336
235 if ( row < 0 || col < 0 ) 337 if ( row < 0 || col < 0 )
236 row = col = -1; 338 row = col = -1;
237 339
238 int oldRow = curRow; 340 int oldRow = curRow;
239 int oldCol = curCol; 341 int oldCol = curCol;
240 342
241 curRow = row; 343 curRow = row;
242 curCol = col; 344 curCol = col;
243 345
244 updateCell( oldRow, oldCol ); 346 updateCell( oldRow, oldCol );
245 updateCell( curRow, curCol ); 347 updateCell( curRow, curCol );
246} 348}
247 349
248 350
249/*! 351/*!
250 Sets the currently selected cell to \a row, \a col. If \a row or \a 352 Sets the currently selected cell to \a row, \a col. If \a row or \a
251 col are less than zero, the current cell is unselected. 353 col are less than zero, the current cell is unselected.
252 354
253 Does not set the position of the focus indicator. 355 Does not set the position of the focus indicator.
254*/ 356*/
255 357
256void QWellArray::setSelected( int row, int col ) 358void QWellArray::setSelected( int row, int col )
257{ 359{
258 if ( (selRow == row) && (selCol == col) ) 360 if ( (selRow == row) && (selCol == col) )
259 return; 361 return;
260 362
261 int oldRow = selRow; 363 int oldRow = selRow;
262 int oldCol = selCol; 364 int oldCol = selCol;
263 365
264 if ( row < 0 || col < 0 ) 366 if ( row < 0 || col < 0 )
265 row = col = -1; 367 row = col = -1;
266 368
267 selCol = col; 369 selCol = col;
268 selRow = row; 370 selRow = row;
269 371
270 updateCell( oldRow, oldCol ); 372 updateCell( oldRow, oldCol );
271 updateCell( selRow, selCol ); 373 updateCell( selRow, selCol );
272 if ( row >= 0 ) 374 if ( row >= 0 )
273 emit selected( row, col ); 375 emit selected( row, col );
274 376
275 if ( isVisible() && parentWidget() && parentWidget()->inherits("QPopupMenu") ) 377 if ( isVisible() && parentWidget() && parentWidget()->inherits("QPopupMenu") )
276 parentWidget()->close(); 378 parentWidget()->close();
277 379
278} 380}
279 381
280 382
281 383
282/*!\reimp 384/*!\reimp
283*/ 385*/
284void QWellArray::focusInEvent( QFocusEvent* ) 386void QWellArray::focusInEvent( QFocusEvent* )
285{ 387{
286 updateCell( curRow, curCol ); 388 updateCell( curRow, curCol );
287} 389}
288 390
289 391
290/*! 392/*!
291 Sets the size of the well array to be \c rows cells by \c cols. 393 Sets the size of the well array to be \c rows cells by \c cols.
292 Resets any brush info set by setCellBrush(). 394 Resets any brush info set by setCellBrush().
293 395
294 Must be called by reimplementors. 396 Must be called by reimplementors.
295 */ 397 */
296void QWellArray::setDimension( int rows, int cols ) 398void QWellArray::setDimension( int rows, int cols )
297{ 399{
298 nRows = rows; 400 nRows = rows;
299 nCols = cols; 401 nCols = cols;
300 if ( d ) { 402 if ( d ) {
301 if ( d->brush ) 403 if ( d->brush )
302 delete[] d->brush; 404 delete[] d->brush;
303 delete d; 405 delete d;
304 d = 0; 406 d = 0;
305 } 407 }
306 setNumCols( nCols ); 408 setNumCols( nCols );
307 setNumRows( nRows ); 409 setNumRows( nRows );
308} 410}
309 411
310void QWellArray::setCellBrush( int row, int col, const QBrush &b ) 412void QWellArray::setCellBrush( int row, int col, const QBrush &b )
311{ 413{
312 if ( !d ) { 414 if ( !d ) {
313 d = new QWellArrayData; 415 d = new QWellArrayData;
314 d->brush = new QBrush[nRows*nCols]; 416 d->brush = new QBrush[nRows*nCols];
315 } 417 }
316 if ( row >= 0 && row < nRows && col >= 0 && col < nCols ) 418 if ( row >= 0 && row < nRows && col >= 0 && col < nCols )
317 d->brush[row*nCols+col] = b; 419 d->brush[row*nCols+col] = b;
318#ifdef CHECK_RANGE 420#ifdef CHECK_RANGE
319 else 421 else
320 qWarning( "QWellArray::setCellBrush( %d, %d ) out of range", row, col ); 422 qWarning( "QWellArray::setCellBrush( %d, %d ) out of range", row, col );
321#endif 423#endif
322} 424}
323 425
324 426
325 427
326/*! 428/*!
327 Returns the brush set for the cell at \a row, \a col. If no brush is set, 429 Returns the brush set for the cell at \a row, \a col. If no brush is set,
328 \c NoBrush is returned. 430 \c NoBrush is returned.
329*/ 431*/
330 432
331QBrush QWellArray::cellBrush( int row, int col ) 433QBrush QWellArray::cellBrush( int row, int col )
332{ 434{
333 if ( d && row >= 0 && row < nRows && col >= 0 && col < nCols ) 435 if ( d && row >= 0 && row < nRows && col >= 0 && col < nCols )
334 return d->brush[row*nCols+col]; 436 return d->brush[row*nCols+col];
335 return NoBrush; 437 return NoBrush;
336} 438}
337 439
338 440
339 441
340/*!\reimp 442/*!\reimp
341*/ 443*/
342 444
343void QWellArray::focusOutEvent( QFocusEvent* ) 445void QWellArray::focusOutEvent( QFocusEvent* )
344{ 446{
345 updateCell( curRow, curCol ); 447 updateCell( curRow, curCol );
346} 448}
347 449
348/*\reimp 450/*\reimp
349*/ 451*/
350void QWellArray::keyPressEvent( QKeyEvent* e ) 452void QWellArray::keyPressEvent( QKeyEvent* e )
351{ 453{
352 switch( e->key() ) { // Look at the key code 454 switch( e->key() ) { // Look at the key code
353 case Key_Left: // If 'left arrow'-key, 455 case Key_Left: // If 'left arrow'-key,
354 if( curCol > 0 ) { // and cr't not in leftmost col 456 if( curCol > 0 ) { // and cr't not in leftmost col
355 setCurrent( curRow, curCol - 1); // set cr't to next left column 457 setCurrent( curRow, curCol - 1);// set cr't to next left column
356 int edge = leftCell(); // find left edge 458 int edge = leftCell(); // find left edge
357 if ( curCol < edge ) // if we have moved off edge, 459 if ( curCol < edge ) // if we have moved off edge,
358 setLeftCell( edge - 1 ); // scroll view to rectify 460 setLeftCell( edge - 1 );// scroll view to rectify
359 } 461 }
360 break; 462 break;
361 case Key_Right: // Correspondingly... 463 case Key_Right: // Correspondingly...
362 if( curCol < numCols()-1 ) { 464 if( curCol < numCols()-1 ) {
363 setCurrent( curRow, curCol + 1); 465 setCurrent( curRow, curCol + 1);
364 int edge = lastColVisible(); 466 int edge = lastColVisible();
365 if ( curCol >= edge ) 467 if ( curCol >= edge )
366 setLeftCell( leftCell() + 1 ); 468 setLeftCell( leftCell() + 1 );
367 } 469 }
368 break; 470 break;
369 case Key_Up: 471 case Key_Up:
370 if( curRow > 0 ) { 472 if( curRow > 0 ) {
371 setCurrent( curRow - 1, curCol); 473 setCurrent( curRow - 1, curCol);
372 int edge = topCell(); 474 int edge = topCell();
373 if ( curRow < edge ) 475 if ( curRow < edge )
374 setTopCell( edge - 1 ); 476 setTopCell( edge - 1 );
375 } else if ( smallStyle ) 477 } else if ( smallStyle )
376 focusNextPrevChild( FALSE ); 478 focusNextPrevChild( FALSE );
377 break; 479 break;
378 case Key_Down: 480 case Key_Down:
379 if( curRow < numRows()-1 ) { 481 if( curRow < numRows()-1 ) {
380 setCurrent( curRow + 1, curCol); 482 setCurrent( curRow + 1, curCol);
381 int edge = lastRowVisible(); 483 int edge = lastRowVisible();
382 if ( curRow >= edge ) 484 if ( curRow >= edge )
383 setTopCell( topCell() + 1 ); 485 setTopCell( topCell() + 1 );
384 } else if ( smallStyle ) 486 } else if ( smallStyle )
385 focusNextPrevChild( TRUE ); 487 focusNextPrevChild( TRUE );
386 break; 488 break;
387 case Key_Space: 489 case Key_Space:
388 case Key_Return: 490 case Key_Return:
389 case Key_Enter: 491 case Key_Enter:
390 setSelected( curRow, curCol ); 492 setSelected( curRow, curCol );
391 break; 493 break;
392 default: // If not an interesting key, 494 default: // If not an interesting key,
393 e->ignore(); // we don't accept the event 495 e->ignore(); // we don't accept the event
394 return; 496 return;
395 } 497 }
396 498
397} 499}
398 500
399//////////// QWellArray END 501//////////// QWellArray END
400 502
401static bool initrgb = FALSE; 503static bool initrgb = FALSE;
402static QRgb stdrgb[6*8]; 504static QRgb stdrgb[6*8];
403static QRgb cusrgb[2*8]; 505static QRgb cusrgb[2*8];
404 506
405 507
406static void initRGB() 508static void initRGB()
407{ 509{
408 if ( initrgb ) 510 if ( initrgb )
409 return; 511 return;
410 initrgb = TRUE; 512 initrgb = TRUE;
411 int i = 0; 513 int i = 0;
412 for ( int g = 0; g < 4; g++ ) 514 for ( int g = 0; g < 4; g++ )
413 for ( int r = 0; r < 4; r++ ) 515 for ( int r = 0; r < 4; r++ )
414 for ( int b = 0; b < 3; b++ ) 516 for ( int b = 0; b < 3; b++ )
415 stdrgb[i++] = qRgb( r*255/3, g*255/3, b*255/2 ); 517 stdrgb[i++] = qRgb( r*255/3, g*255/3, b*255/2 );
416 518
417 for ( i = 0; i < 2*8; i++ ) 519 for ( i = 0; i < 2*8; i++ )
418 cusrgb[i] = qRgb(0xff,0xff,0xff); 520 cusrgb[i] = qRgb(0xff,0xff,0xff);
419} 521}
420 522
421/*! 523/*!
422 Returns the number of custom colors supported by 524 Returns the number of custom colors supported by
423 QColorDialog. All color dialogs share the same custom colors. 525 QColorDialog. All color dialogs share the same custom colors.
424*/ 526*/
425int QColorDialog::customCount() 527int QColorDialog::customCount()
426{ 528{
427 return 2*8; 529 return 2*8;
428} 530}
429 531
430/*! 532/*!
431 Returns custom color number \a i as a QRgb. 533 Returns custom color number \a i as a QRgb.
432 */ 534 */
433QRgb QColorDialog::customColor( int i ) 535QRgb QColorDialog::customColor( int i )
434{ 536{
435 initRGB(); 537 initRGB();
436 if ( i < 0 || i >= customCount() ) { 538 if ( i < 0 || i >= customCount() ) {
437#ifdef CHECK_RANGE 539#ifdef CHECK_RANGE
438 qWarning( "QColorDialog::customColor() index %d out of range", i ); 540 qWarning( "QColorDialog::customColor() index %d out of range", i );
439#endif 541 #endif
440 i = 0; 542 i = 0;
441 } 543 }
442 return cusrgb[i]; 544 return cusrgb[i];
443} 545}
444 546
445/*! 547/*!
446 Sets custom color number \a i to the QRgb value \a c. 548 Sets custom color number \a i to the QRgb value \a c.
447*/ 549*/
448void QColorDialog::setCustomColor( int i, QRgb c ) 550void QColorDialog::setCustomColor( int i, QRgb c )
449{ 551{
450 initRGB(); 552 initRGB();
451 if ( i < 0 || i >= customCount() ) { 553 if ( i < 0 || i >= customCount() ) {
452#ifdef CHECK_RANGE 554#ifdef CHECK_RANGE
453 qWarning( "QColorDialog::customColor() index %d out of range", i ); 555 qWarning( "QColorDialog::customColor() index %d out of range", i );
454#endif 556 #endif
455 return; 557 return;
456 } 558 }
457 cusrgb[i] = c; 559 cusrgb[i] = c;
458} 560}
459 561
460static inline void rgb2hsv( QRgb rgb, int&h, int&s, int&v ) 562static inline void rgb2hsv( QRgb rgb, int&h, int&s, int&v )
461{ 563{
462 QColor c; 564 QColor c;
463 c.setRgb( rgb ); 565 c.setRgb( rgb );
464 c.getHsv(h,s,v); 566 c.getHsv(h,s,v);
465} 567}
466 568
569class QColorWell : public QWellArray
570{
571public:
572 QColorWell( QWidget *parent, int r, int c, QRgb *vals )
573 :QWellArray( parent, "" ), values( vals ), mousePressed( FALSE ), oldCurrent( -1, -1 )
574 { setDimension(r,c); setWFlags( WResizeNoErase ); }
575 QSizePolicy sizePolicy() const;
576
577protected:
578 void drawContents( QPainter *, int row, int col, const QRect& );
579 void drawContents( QPainter *p ) { QWellArray::drawContents(p); }
580 void mousePressEvent( QMouseEvent *e );
581 void mouseMoveEvent( QMouseEvent *e );
582 void mouseReleaseEvent( QMouseEvent *e );
583#ifndef QT_NO_DRAGANDDROP
584 void dragEnterEvent( QDragEnterEvent *e );
585 void dragLeaveEvent( QDragLeaveEvent *e );
586 void dragMoveEvent( QDragMoveEvent *e );
587 void dropEvent( QDropEvent *e );
588#endif
589
590private:
591 QRgb *values;
592 bool mousePressed;
593 QPoint pressPos;
594 QPoint oldCurrent;
595
596};
597
467QSizePolicy QColorWell::sizePolicy() const 598QSizePolicy QColorWell::sizePolicy() const
468{ 599{
469 return QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ); 600 return QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum );
470} 601}
471 602
472void QColorWell::drawContents( QPainter *p, int row, int col, const QRect &r ) 603void QColorWell::drawContents( QPainter *p, int row, int col, const QRect &r )
473{ 604{
474 int i = row + col*numRows(); 605 int i = row + col*numRows();
475 p->fillRect( r, QColor( values[i] ) ); 606 p->fillRect( r, QColor( values[i] ) );
476} 607}
477 608
478void QColorWell::mousePressEvent( QMouseEvent *e ) 609void QColorWell::mousePressEvent( QMouseEvent *e )
479{ 610{
480 oldCurrent = QPoint( selectedRow(), selectedColumn() ); 611 oldCurrent = QPoint( selectedRow(), selectedColumn() );
481 QWellArray::mousePressEvent( e ); 612 QWellArray::mousePressEvent( e );
482 mousePressed = TRUE; 613 mousePressed = TRUE;
483 pressPos = e->pos(); 614 pressPos = e->pos();
484} 615}
485 616
486void QColorWell::mouseMoveEvent( QMouseEvent *e ) 617void QColorWell::mouseMoveEvent( QMouseEvent *e )
487{ 618{
488 QWellArray::mouseMoveEvent( e ); 619 QWellArray::mouseMoveEvent( e );
489#ifndef QT_NO_DRAGANDDROP 620#ifndef QT_NO_DRAGANDDROP
490 if ( !mousePressed ) 621 if ( !mousePressed )
491 return; 622 return;
492 if ( ( pressPos - e->pos() ).manhattanLength() > QApplication::startDragDistance() ) { 623 if ( ( pressPos - e->pos() ).manhattanLength() > QApplication::startDragDistance() ) {
493 setCurrent( oldCurrent.x(), oldCurrent.y() ); 624 setCurrent( oldCurrent.x(), oldCurrent.y() );
494 int i = findRow( e->y() ) + findCol( e->x() ) * numRows(); 625 int i = findRow( e->y() ) + findCol( e->x() ) * numRows();
495 QColor col( values[ i ] ); 626 QColor col( values[ i ] );
496 QColorDrag *drg = new QColorDrag( col, this ); 627 QColorDrag *drg = new QColorDrag( col, this );
497 QPixmap pix( cellWidth(), cellHeight() ); 628 QPixmap pix( cellWidth(), cellHeight() );
498 pix.fill( col ); 629 pix.fill( col );
499 QPainter p( &pix ); 630 QPainter p( &pix );
500 p.drawRect( 0, 0, pix.width(), pix.height() ); 631 p.drawRect( 0, 0, pix.width(), pix.height() );
501 p.end(); 632 p.end();
502 drg->setPixmap( pix ); 633 drg->setPixmap( pix );
503 mousePressed = FALSE; 634 mousePressed = FALSE;
504 drg->dragCopy(); 635 drg->dragCopy();
505 } 636 }
506#endif 637#endif
507} 638}
508 639
509#ifndef QT_NO_DRAGANDDROP 640#ifndef QT_NO_DRAGANDDROP
510void QColorWell::dragEnterEvent( QDragEnterEvent *e ) 641void QColorWell::dragEnterEvent( QDragEnterEvent *e )
511{ 642{
512 setFocus(); 643 setFocus();
513 if ( QColorDrag::canDecode( e ) ) 644 if ( QColorDrag::canDecode( e ) )
514 e->accept(); 645 e->accept();
515 else 646 else
516 e->ignore(); 647 e->ignore();
517} 648}
518 649
519void QColorWell::dragLeaveEvent( QDragLeaveEvent * ) 650void QColorWell::dragLeaveEvent( QDragLeaveEvent * )
520{ 651{
521 if ( hasFocus() ) 652 if ( hasFocus() )
522 parentWidget()->setFocus(); 653 parentWidget()->setFocus();
523} 654}
524 655
525void QColorWell::dragMoveEvent( QDragMoveEvent *e ) 656void QColorWell::dragMoveEvent( QDragMoveEvent *e )
526{ 657{
527 if ( QColorDrag::canDecode( e ) ) { 658 if ( QColorDrag::canDecode( e ) ) {
528 setCurrent( findRow( e->pos().y() ), findCol( e->pos().x() ) ); 659 setCurrent( findRow( e->pos().y() ), findCol( e->pos().x() ) );
529 e->accept(); 660 e->accept();
530 } else 661 } else
531 e->ignore(); 662 e->ignore();
532} 663}
533 664
534void QColorWell::dropEvent( QDropEvent *e ) 665void QColorWell::dropEvent( QDropEvent *e )
535{ 666{
536 if ( QColorDrag::canDecode( e ) ) { 667 if ( QColorDrag::canDecode( e ) ) {
537 int i = findRow( e->pos().y() ) + findCol( e->pos().x() ) * numRows(); 668 int i = findRow( e->pos().y() ) + findCol( e->pos().x() ) * numRows();
538 QColor col; 669 QColor col;
539 QColorDrag::decode( e, col ); 670 QColorDrag::decode( e, col );
540 values[ i ] = col.rgb(); 671 values[ i ] = col.rgb();
541 repaint( FALSE ); 672 repaint( FALSE );
542 e->accept(); 673 e->accept();
543 } else { 674 } else {
544 e->ignore(); 675 e->ignore();
545 } 676 }
546} 677}
547 678
548#endif // QT_NO_DRAGANDDROP 679#endif // QT_NO_DRAGANDDROP
549 680
550void QColorWell::mouseReleaseEvent( QMouseEvent *e ) 681void QColorWell::mouseReleaseEvent( QMouseEvent *e )
551{ 682{
552 if ( !mousePressed ) 683 if ( !mousePressed )
553 return; 684 return;
554 QWellArray::mouseReleaseEvent( e ); 685 QWellArray::mouseReleaseEvent( e );
555 mousePressed = FALSE; 686 mousePressed = FALSE;
556} 687}
557 688
689class QColorPicker : public QFrame
690{
691 Q_OBJECT
692public:
693 QColorPicker(QWidget* parent=0, const char* name=0);
694 ~QColorPicker();
695
696public slots:
697 void setCol( int h, int s );
698
699signals:
700 void newCol( int h, int s );
701
702protected:
703 QSize sizeHint() const;
704 QSizePolicy sizePolicy() const;
705 void drawContents(QPainter* p);
706 void mouseMoveEvent( QMouseEvent * );
707 void mousePressEvent( QMouseEvent * );
708
709private:
710 int hue;
711 int sat;
712
713 QPoint colPt();
714 int huePt( const QPoint &pt );
715 int satPt( const QPoint &pt );
716 void setCol( const QPoint &pt );
717
718 QPixmap *pix;
719};
720
558static int pWidth = 200; 721static int pWidth = 200;
559static int pHeight = 200; 722static int pHeight = 200;
560 723
724class QColorLuminancePicker : public QWidget
725{
726 Q_OBJECT
727public:
728 QColorLuminancePicker(QWidget* parent=0, const char* name=0);
729 ~QColorLuminancePicker();
730
731public slots:
732 void setCol( int h, int s, int v );
733 void setCol( int h, int s );
734
735signals:
736 void newHsv( int h, int s, int v );
737
738protected:
739// QSize sizeHint() const;
740// QSizePolicy sizePolicy() const;
741 void paintEvent( QPaintEvent*);
742 void mouseMoveEvent( QMouseEvent * );
743 void mousePressEvent( QMouseEvent * );
744
745private:
746 enum { foff = 3, coff = 4 }; //frame and contents offset
747 int val;
748 int hue;
749 int sat;
750
751 int y2val( int y );
752 int val2y( int val );
753 void setVal( int v );
754
755 QPixmap *pix;
756};
757
758
561int QColorLuminancePicker::y2val( int y ) 759int QColorLuminancePicker::y2val( int y )
562{ 760{
563 int d = height() - 2*coff - 1; 761 int d = height() - 2*coff - 1;
564 return 255 - (y - coff)*255/d; 762 return 255 - (y - coff)*255/d;
565} 763}
566 764
567int QColorLuminancePicker::val2y( int v ) 765int QColorLuminancePicker::val2y( int v )
568{ 766{
569 int d = height() - 2*coff - 1; 767 int d = height() - 2*coff - 1;
570 return coff + (255-v)*d/255; 768 return coff + (255-v)*d/255;
571} 769}
572 770
573QColorLuminancePicker::QColorLuminancePicker(QWidget* parent, 771QColorLuminancePicker::QColorLuminancePicker(QWidget* parent,
574 const char* name) 772 const char* name)
575 :QWidget( parent, name ) 773 :QWidget( parent, name )
576{ 774{
577 hue = 100; val = 100; sat = 100; 775 hue = 100; val = 100; sat = 100;
578 pix = 0; 776 pix = 0;
579 // setBackgroundMode( NoBackground ); 777 // setBackgroundMode( NoBackground );
580} 778}
581 779
582QColorLuminancePicker::~QColorLuminancePicker() 780QColorLuminancePicker::~QColorLuminancePicker()
583{ 781{
584 delete pix; 782 delete pix;
585} 783}
586 784
587void QColorLuminancePicker::mouseMoveEvent( QMouseEvent *m ) 785void QColorLuminancePicker::mouseMoveEvent( QMouseEvent *m )
588{ 786{
589 setVal( y2val(m->y()) ); 787 setVal( y2val(m->y()) );
590} 788}
591void QColorLuminancePicker::mousePressEvent( QMouseEvent *m ) 789void QColorLuminancePicker::mousePressEvent( QMouseEvent *m )
592{ 790{
593 setVal( y2val(m->y()) ); 791 setVal( y2val(m->y()) );
594} 792}
595 793
596void QColorLuminancePicker::setVal( int v ) 794void QColorLuminancePicker::setVal( int v )
597{ 795{
598 if ( val == v ) 796 if ( val == v )
599 return; 797 return;
600 val = QMAX( 0, QMIN(v,255)); 798 val = QMAX( 0, QMIN(v,255));
601 delete pix; pix=0; 799 delete pix; pix=0;
602 repaint( FALSE ); //### 800 repaint( FALSE ); //###
603 emit newHsv( hue, sat, val ); 801 emit newHsv( hue, sat, val );
604} 802}
605 803
606//receives from a hue,sat chooser and relays. 804//receives from a hue,sat chooser and relays.
607void QColorLuminancePicker::setCol( int h, int s ) 805void QColorLuminancePicker::setCol( int h, int s )
608{ 806{
609 setCol( h, s, val ); 807 setCol( h, s, val );
610 emit newHsv( h, s, val ); 808 emit newHsv( h, s, val );
611} 809}
612 810
613void QColorLuminancePicker::paintEvent( QPaintEvent * ) 811void QColorLuminancePicker::paintEvent( QPaintEvent * )
614{ 812{
615 int w = width() - 5; 813 int w = width() - 5;
616 814
617 QRect r( 0, foff, w, height() - 2*foff ); 815 QRect r( 0, foff, w, height() - 2*foff );
618 int wi = r.width() - 2; 816 int wi = r.width() - 2;
619 int hi = r.height() - 2; 817 int hi = r.height() - 2;
620 if ( !pix || pix->height() != hi || pix->width() != wi ) { 818 if ( !pix || pix->height() != hi || pix->width() != wi ) {
621 delete pix; 819 delete pix;
622 QImage img( wi, hi, 32 ); 820 QImage img( wi, hi, 32 );
623 int y; 821 int y;
624 for ( y = 0; y < hi; y++ ) { 822 for ( y = 0; y < hi; y++ ) {
625 QColor c( hue, sat, y2val(y+coff), QColor::Hsv ); 823 QColor c( hue, sat, y2val(y+coff), QColor::Hsv );
626 QRgb r = c.rgb(); 824 QRgb r = c.rgb();
627 int x; 825 int x;
628 for ( x = 0; x < wi; x++ ) 826 for ( x = 0; x < wi; x++ )
629 img.setPixel( x, y, r ); 827 img.setPixel( x, y, r );
630 } 828 }
631 pix = new QPixmap; 829 pix = new QPixmap;
632 pix->convertFromImage(img); 830 pix->convertFromImage(img);
633 } 831 }
634 QPainter p(this); 832 QPainter p(this);
635 p.drawPixmap( 1, coff, *pix ); 833 p.drawPixmap( 1, coff, *pix );
636 QColorGroup g = colorGroup(); 834 QColorGroup g = colorGroup();
637 qDrawShadePanel( &p, r, g, TRUE ); 835 qDrawShadePanel( &p, r, g, TRUE );
638 p.setPen( g.foreground() ); 836 p.setPen( g.foreground() );
639 p.setBrush( g.foreground() ); 837 p.setBrush( g.foreground() );
640 QPointArray a; 838 QPointArray a;
641 int y = val2y(val); 839 int y = val2y(val);
642 a.setPoints( 3, w, y, w+5, y+5, w+5, y-5 ); 840 a.setPoints( 3, w, y, w+5, y+5, w+5, y-5 );
643 erase( w, 0, 5, height() ); 841 erase( w, 0, 5, height() );
644 p.drawPolygon( a ); 842 p.drawPolygon( a );
645} 843}
646 844
647void QColorLuminancePicker::setCol( int h, int s , int v ) 845void QColorLuminancePicker::setCol( int h, int s , int v )
648{ 846{
649 val = v; 847 val = v;
650 hue = h; 848 hue = h;
651 sat = s; 849 sat = s;
652 delete pix; pix=0; 850 delete pix; pix=0;
653 repaint( FALSE );//#### 851 repaint( FALSE );//####
654} 852}
655 853
656QPoint QColorPicker::colPt() 854QPoint QColorPicker::colPt()
657{ return QPoint( (360-hue)*(pWidth-1)/360, (255-sat)*(pHeight-1)/255 ); } 855{ return QPoint( (360-hue)*(pWidth-1)/360, (255-sat)*(pHeight-1)/255 ); }
658int QColorPicker::huePt( const QPoint &pt ) 856int QColorPicker::huePt( const QPoint &pt )
659{ return 360 - pt.x()*360/(pWidth-1); } 857{ return 360 - pt.x()*360/(pWidth-1); }
660int QColorPicker::satPt( const QPoint &pt ) 858int QColorPicker::satPt( const QPoint &pt )
661{ return 255 - pt.y()*255/(pHeight-1) ; } 859{ return 255 - pt.y()*255/(pHeight-1) ; }
662void QColorPicker::setCol( const QPoint &pt ) 860void QColorPicker::setCol( const QPoint &pt )
663{ setCol( huePt(pt), satPt(pt) ); } 861{ setCol( huePt(pt), satPt(pt) ); }
664 862
665QColorPicker::QColorPicker(QWidget* parent, const char* name ) 863QColorPicker::QColorPicker(QWidget* parent, const char* name )
666 : QFrame( parent, name ) 864 : QFrame( parent, name )
667{ 865{
668 hue = 0; sat = 0; 866 hue = 0; sat = 0;
669 setCol( 150, 255 ); 867 setCol( 150, 255 );
670 868
671 QImage img( pWidth, pHeight, 32 ); 869 QImage img( pWidth, pHeight, 32 );
672 int x,y; 870 int x,y;
673 for ( y = 0; y < pHeight; y++ ) 871 for ( y = 0; y < pHeight; y++ )
674 for ( x = 0; x < pWidth; x++ ) { 872 for ( x = 0; x < pWidth; x++ ) {
675 QPoint p( x, y ); 873 QPoint p( x, y );
676 img.setPixel( x, y, QColor(huePt(p), satPt(p), 874 img.setPixel( x, y, QColor(huePt(p), satPt(p),
677 200, QColor::Hsv).rgb() ); 875 200, QColor::Hsv).rgb() );
678 } 876 }
679 pix = new QPixmap; 877 pix = new QPixmap;
680 pix->convertFromImage(img); 878 pix->convertFromImage(img);
681 setBackgroundMode( NoBackground ); 879 setBackgroundMode( NoBackground );
682} 880}
683 881
684QColorPicker::~QColorPicker() 882QColorPicker::~QColorPicker()
685{ 883{
686 delete pix; 884 delete pix;
687} 885}
688 886
689QSize QColorPicker::sizeHint() const 887QSize QColorPicker::sizeHint() const
690{ 888{
691 return QSize( pWidth + 2*frameWidth(), pHeight + 2*frameWidth() ); 889 return QSize( pWidth + 2*frameWidth(), pHeight + 2*frameWidth() );
692} 890}
693 891
694QSizePolicy QColorPicker::sizePolicy() const 892QSizePolicy QColorPicker::sizePolicy() const
695{ 893{
696 return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ); 894 return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
697} 895}
698 896
699void QColorPicker::setCol( int h, int s ) 897void QColorPicker::setCol( int h, int s )
700{ 898{
701 int nhue = QMIN( QMAX(0,h), 360 ); 899 int nhue = QMIN( QMAX(0,h), 360 );
702 int nsat = QMIN( QMAX(0,s), 255); 900 int nsat = QMIN( QMAX(0,s), 255);
703 if ( nhue == hue && nsat == sat ) 901 if ( nhue == hue && nsat == sat )
704 return; 902 return;
705 QRect r( colPt(), QSize(20,20) ); 903 QRect r( colPt(), QSize(20,20) );
706 hue = nhue; sat = nsat; 904 hue = nhue; sat = nsat;
707 r = r.unite( QRect( colPt(), QSize(20,20) ) ); 905 r = r.unite( QRect( colPt(), QSize(20,20) ) );
708 r.moveBy( contentsRect().x()-9, contentsRect().y()-9 ); 906 r.moveBy( contentsRect().x()-9, contentsRect().y()-9 );
709 // update( r ); 907 // update( r );
710 repaint( r, FALSE ); 908 repaint( r, FALSE );
711} 909}
712 910
713void QColorPicker::mouseMoveEvent( QMouseEvent *m ) 911void QColorPicker::mouseMoveEvent( QMouseEvent *m )
714{ 912{
715 QPoint p = m->pos() - contentsRect().topLeft(); 913 QPoint p = m->pos() - contentsRect().topLeft();
716 setCol( p ); 914 setCol( p );
717 emit newCol( hue, sat ); 915 emit newCol( hue, sat );
718} 916}
719 917
720void QColorPicker::mousePressEvent( QMouseEvent *m ) 918void QColorPicker::mousePressEvent( QMouseEvent *m )
721{ 919{
722 QPoint p = m->pos() - contentsRect().topLeft(); 920 QPoint p = m->pos() - contentsRect().topLeft();
723 setCol( p ); 921 setCol( p );
724 emit newCol( hue, sat ); 922 emit newCol( hue, sat );
725} 923}
726 924
727void QColorPicker::drawContents(QPainter* p) 925void QColorPicker::drawContents(QPainter* p)
728{ 926{
729 QRect r = contentsRect(); 927 QRect r = contentsRect();
730 928
731 p->drawPixmap( r.topLeft(), *pix ); 929 p->drawPixmap( r.topLeft(), *pix );
732 QPoint pt = colPt() + r.topLeft(); 930 QPoint pt = colPt() + r.topLeft();
733 p->setPen( QPen(black) ); 931 p->setPen( QPen(black) );
734 932
735 p->fillRect( pt.x()-9, pt.y(), 20, 2, black ); 933 p->fillRect( pt.x()-9, pt.y(), 20, 2, black );
736 p->fillRect( pt.x(), pt.y()-9, 2, 20, black ); 934 p->fillRect( pt.x(), pt.y()-9, 2, 20, black );
737 935
738} 936}
739 937
938class QColorShowLabel;
939
940
941
942class QColIntValidator: public QIntValidator
943{
944public:
945 QColIntValidator( int bottom, int top,
946 QWidget * parent, const char *name = 0 )
947 :QIntValidator( bottom, top, parent, name ) {}
948
949 QValidator::State validate( QString &, int & ) const;
950};
951
740QValidator::State QColIntValidator::validate( QString &s, int &pos ) const 952QValidator::State QColIntValidator::validate( QString &s, int &pos ) const
741{ 953{
742 State state = QIntValidator::validate(s,pos); 954 State state = QIntValidator::validate(s,pos);
743 if ( state == Valid ) { 955 if ( state == Valid ) {
744 long int val = s.toLong(); 956 long int val = s.toLong();
745 // This is not a general solution, assumes that top() > 0 and 957 // This is not a general solution, assumes that top() > 0 and
746 // bottom >= 0 958 // bottom >= 0
747 if ( val < 0 ) { 959 if ( val < 0 ) {
748 s = "0"; 960 s = "0";
749 pos = 1; 961 pos = 1;
750 } else if ( val > top() ) { 962 } else if ( val > top() ) {
751 s.setNum( top() ); 963 s.setNum( top() );
752 pos = s.length(); 964 pos = s.length();
753 } 965 }
754 } 966 }
755 return state; 967 return state;
756} 968}
757 969
970
971
972class QColNumLineEdit : public QLineEdit
973{
974public:
975 QColNumLineEdit( QWidget *parent, const char* name = 0 )
976 : QLineEdit( parent, name ) { setMaxLength( 3 );}
977 QSize sizeHint() const {
978 return QSize( 30, //#####
979 QLineEdit::sizeHint().height() ); }
980 void setNum( int i ) {
981 QString s;
982 s.setNum(i);
983 bool block = signalsBlocked();
984 blockSignals(TRUE);
985 setText( s );
986 blockSignals(block);
987 }
988 int val() const { return text().toInt(); }
989};
990
991
992class QColorShower : public QWidget
993{
994 Q_OBJECT
995public:
996 QColorShower( QWidget *parent, const char *name = 0 );
997
998 //things that don't emit signals
999 void setHsv( int h, int s, int v );
1000
1001 int currentAlpha() const { return alphaEd->val(); }
1002 void setCurrentAlpha( int a ) { alphaEd->setNum( a ); }
1003 void showAlpha( bool b );
1004
1005
1006 QRgb currentColor() const { return curCol; }
1007
1008public slots:
1009 void setRgb( QRgb rgb );
1010
1011signals:
1012 void newCol( QRgb rgb );
1013private slots:
1014 void rgbEd();
1015 void hsvEd();
1016private:
1017 void showCurrentColor();
1018 int hue, sat, val;
1019 QRgb curCol;
1020 QColNumLineEdit *hEd;
1021 QColNumLineEdit *sEd;
1022 QColNumLineEdit *vEd;
1023 QColNumLineEdit *rEd;
1024 QColNumLineEdit *gEd;
1025 QColNumLineEdit *bEd;
1026 QColNumLineEdit *alphaEd;
1027 QLabel *alphaLab;
1028 QColorShowLabel *lab;
1029 bool rgbOriginal;
1030};
1031
1032class QColorShowLabel : public QFrame
1033{
1034 Q_OBJECT
1035
1036public:
1037 QColorShowLabel( QWidget *parent ) :QFrame( parent ) {
1038 setFrameStyle( QFrame::Panel|QFrame::Sunken );
1039 setBackgroundMode( PaletteBackground );
1040 setAcceptDrops( TRUE );
1041 mousePressed = FALSE;
1042 }
1043 void setColor( QColor c ) { col = c; }
1044
1045signals:
1046 void colorDropped( QRgb );
1047
1048protected:
1049 void drawContents( QPainter *p );
1050 void mousePressEvent( QMouseEvent *e );
1051 void mouseMoveEvent( QMouseEvent *e );
1052 void mouseReleaseEvent( QMouseEvent *e );
1053#ifndef QT_NO_DRAGANDDROP
1054 void dragEnterEvent( QDragEnterEvent *e );
1055 void dragLeaveEvent( QDragLeaveEvent *e );
1056 void dropEvent( QDropEvent *e );
1057#endif
1058
1059private:
1060 QColor col;
1061 bool mousePressed;
1062 QPoint pressPos;
1063
1064};
1065
758void QColorShowLabel::drawContents( QPainter *p ) 1066void QColorShowLabel::drawContents( QPainter *p )
759{ 1067{
760 p->fillRect( contentsRect(), col ); 1068 p->fillRect( contentsRect(), col );
761} 1069}
762 1070
763void QColorShower::showAlpha( bool b ) 1071void QColorShower::showAlpha( bool b )
764{ 1072{
765 if ( b ) { 1073 if ( b ) {
766 alphaLab->show(); 1074 alphaLab->show();
767 alphaEd->show(); 1075 alphaEd->show();
768 } else { 1076 } else {
769 alphaLab->hide(); 1077 alphaLab->hide();
770 alphaEd->hide(); 1078 alphaEd->hide();
771 } 1079 }
772} 1080}
773 1081
774void QColorShowLabel::mousePressEvent( QMouseEvent *e ) 1082void QColorShowLabel::mousePressEvent( QMouseEvent *e )
775{ 1083{
776 mousePressed = TRUE; 1084 mousePressed = TRUE;
777 pressPos = e->pos(); 1085 pressPos = e->pos();
778} 1086}
779 1087
780void QColorShowLabel::mouseMoveEvent( QMouseEvent *e ) 1088void QColorShowLabel::mouseMoveEvent( QMouseEvent *e )
781{ 1089{
782#ifndef QT_NO_DRAGANDDROP 1090#ifndef QT_NO_DRAGANDDROP
783 if ( !mousePressed ) 1091 if ( !mousePressed )
784 return; 1092 return;
785 if ( ( pressPos - e->pos() ).manhattanLength() > QApplication::startDragDistance() ) { 1093 if ( ( pressPos - e->pos() ).manhattanLength() > QApplication::startDragDistance() ) {
786 QColorDrag *drg = new QColorDrag( col, this ); 1094 QColorDrag *drg = new QColorDrag( col, this );
787 QPixmap pix( 30, 20 ); 1095 QPixmap pix( 30, 20 );
788 pix.fill( col ); 1096 pix.fill( col );
789 QPainter p( &pix ); 1097 QPainter p( &pix );
790 p.drawRect( 0, 0, pix.width(), pix.height() ); 1098 p.drawRect( 0, 0, pix.width(), pix.height() );
791 p.end(); 1099 p.end();
792 drg->setPixmap( pix ); 1100 drg->setPixmap( pix );
793 mousePressed = FALSE; 1101 mousePressed = FALSE;
794 drg->dragCopy(); 1102 drg->dragCopy();
795 } 1103 }
796#endif 1104#endif
797} 1105}
798 1106
799#ifndef QT_NO_DRAGANDDROP 1107#ifndef QT_NO_DRAGANDDROP
800void QColorShowLabel::dragEnterEvent( QDragEnterEvent *e ) 1108void QColorShowLabel::dragEnterEvent( QDragEnterEvent *e )
801{ 1109{
802 if ( QColorDrag::canDecode( e ) ) 1110 if ( QColorDrag::canDecode( e ) )
803 e->accept(); 1111 e->accept();
804 else 1112 else
805 e->ignore(); 1113 e->ignore();
806} 1114}
807 1115
808void QColorShowLabel::dragLeaveEvent( QDragLeaveEvent * ) 1116void QColorShowLabel::dragLeaveEvent( QDragLeaveEvent * )
809{ 1117{
810} 1118}
811 1119
812void QColorShowLabel::dropEvent( QDropEvent *e ) 1120void QColorShowLabel::dropEvent( QDropEvent *e )
813{ 1121{
814 if ( QColorDrag::canDecode( e ) ) { 1122 if ( QColorDrag::canDecode( e ) ) {
815 QColorDrag::decode( e, col ); 1123 QColorDrag::decode( e, col );
816 repaint( FALSE ); 1124 repaint( FALSE );
817 emit colorDropped( col.rgb() ); 1125 emit colorDropped( col.rgb() );
818 e->accept(); 1126 e->accept();
819 } else { 1127 } else {
820 e->ignore(); 1128 e->ignore();
821 } 1129 }
822} 1130}
823#endif // QT_NO_DRAGANDDROP 1131#endif // QT_NO_DRAGANDDROP
824 1132
825void QColorShowLabel::mouseReleaseEvent( QMouseEvent * ) 1133void QColorShowLabel::mouseReleaseEvent( QMouseEvent * )
826{ 1134{
827 if ( !mousePressed ) 1135 if ( !mousePressed )
828 return; 1136 return;
829 mousePressed = FALSE; 1137 mousePressed = FALSE;
830} 1138}
831 1139
832QColorShower::QColorShower( QWidget *parent, const char *name ) 1140QColorShower::QColorShower( QWidget *parent, const char *name )
833 :QWidget( parent, name) 1141 :QWidget( parent, name)
834{ 1142{
835 curCol = qRgb( -1, -1, -1 ); 1143 curCol = qRgb( -1, -1, -1 );
836 QColIntValidator *val256 = new QColIntValidator( 0, 255, this ); 1144 QColIntValidator *val256 = new QColIntValidator( 0, 255, this );
837 QColIntValidator *val360 = new QColIntValidator( 0, 360, this ); 1145 QColIntValidator *val360 = new QColIntValidator( 0, 360, this );
838 1146
839 QGridLayout *gl = new QGridLayout( this, 1, 1, 6 ); 1147 QGridLayout *gl = new QGridLayout( this, 1, 1, 6 );
840 lab = new QColorShowLabel( this ); 1148 lab = new QColorShowLabel( this );
841 lab->setMinimumWidth( 60 ); //### 1149 lab->setMinimumWidth( 60 ); //###
842 gl->addMultiCellWidget(lab, 0,-1,0,0); 1150 gl->addMultiCellWidget(lab, 0,-1,0,0);
843 connect( lab, SIGNAL( colorDropped(QRgb) ), 1151 connect( lab, SIGNAL( colorDropped(QRgb) ),
844 this, SIGNAL( newCol(QRgb) ) ); 1152 this, SIGNAL( newCol(QRgb) ) );
845 connect( lab, SIGNAL( colorDropped(QRgb) ), 1153 connect( lab, SIGNAL( colorDropped(QRgb) ),
846 this, SLOT( setRgb(QRgb) ) ); 1154 this, SLOT( setRgb(QRgb) ) );
847 1155
848 hEd = new QColNumLineEdit( this ); 1156 hEd = new QColNumLineEdit( this );
849 hEd->setValidator( val360 ); 1157 hEd->setValidator( val360 );
850 QLabel *l = new QLabel( hEd, QColorDialog::tr("Hu&e:"), this ); 1158 QLabel *l = new QLabel( hEd, QColorDialog::tr("Hu&e:"), this );
851 l->setAlignment( AlignRight|AlignVCenter ); 1159 l->setAlignment( AlignRight|AlignVCenter );
852 gl->addWidget( l, 0, 1 ); 1160 gl->addWidget( l, 0, 1 );
853 gl->addWidget( hEd, 0, 2 ); 1161 gl->addWidget( hEd, 0, 2 );
854 1162
855 sEd = new QColNumLineEdit( this ); 1163 sEd = new QColNumLineEdit( this );
856 sEd->setValidator( val256 ); 1164 sEd->setValidator( val256 );
857 l = new QLabel( sEd, QColorDialog::tr("&Sat:"), this ); 1165 l = new QLabel( sEd, QColorDialog::tr("&Sat:"), this );
858 l->setAlignment( AlignRight|AlignVCenter ); 1166 l->setAlignment( AlignRight|AlignVCenter );
859 gl->addWidget( l, 1, 1 ); 1167 gl->addWidget( l, 1, 1 );
860 gl->addWidget( sEd, 1, 2 ); 1168 gl->addWidget( sEd, 1, 2 );
861 1169
862 vEd = new QColNumLineEdit( this ); 1170 vEd = new QColNumLineEdit( this );
863 vEd->setValidator( val256 ); 1171 vEd->setValidator( val256 );
864 l = new QLabel( vEd, QColorDialog::tr("&Val:"), this ); 1172 l = new QLabel( vEd, QColorDialog::tr("&Val:"), this );
865 l->setAlignment( AlignRight|AlignVCenter ); 1173 l->setAlignment( AlignRight|AlignVCenter );
866 gl->addWidget( l, 2, 1 ); 1174 gl->addWidget( l, 2, 1 );
867 gl->addWidget( vEd, 2, 2 ); 1175 gl->addWidget( vEd, 2, 2 );
868 1176
869 rEd = new QColNumLineEdit( this ); 1177 rEd = new QColNumLineEdit( this );
870 rEd->setValidator( val256 ); 1178 rEd->setValidator( val256 );
@@ -957,187 +1265,216 @@ void QColorShower::setRgb( QRgb rgb )
957 gEd->setNum( qGreen(currentColor()) ); 1265 gEd->setNum( qGreen(currentColor()) );
958 bEd->setNum( qBlue(currentColor()) ); 1266 bEd->setNum( qBlue(currentColor()) );
959 1267
960 showCurrentColor(); 1268 showCurrentColor();
961} 1269}
962 1270
963void QColorShower::setHsv( int h, int s, int v ) 1271void QColorShower::setHsv( int h, int s, int v )
964{ 1272{
965 rgbOriginal = FALSE; 1273 rgbOriginal = FALSE;
966 hue = h; val = v; sat = s; //Range check### 1274 hue = h; val = v; sat = s; //Range check###
967 curCol = QColor( hue, sat, val, QColor::Hsv ).rgb(); 1275 curCol = QColor( hue, sat, val, QColor::Hsv ).rgb();
968 1276
969 hEd->setNum( hue ); 1277 hEd->setNum( hue );
970 sEd->setNum( sat ); 1278 sEd->setNum( sat );
971 vEd->setNum( val ); 1279 vEd->setNum( val );
972 1280
973 rEd->setNum( qRed(currentColor()) ); 1281 rEd->setNum( qRed(currentColor()) );
974 gEd->setNum( qGreen(currentColor()) ); 1282 gEd->setNum( qGreen(currentColor()) );
975 bEd->setNum( qBlue(currentColor()) ); 1283 bEd->setNum( qBlue(currentColor()) );
976 1284
977 1285
978 showCurrentColor(); 1286 showCurrentColor();
979} 1287}
980 1288
1289class QColorDialogPrivate : public QObject
1290{
1291Q_OBJECT
1292public:
1293 QColorDialogPrivate( QColorDialog *p );
1294 QRgb currentColor() const { return cs->currentColor(); }
1295 void setCurrentColor( QRgb rgb );
1296
1297 int currentAlpha() const { return cs->currentAlpha(); }
1298 void setCurrentAlpha( int a ) { cs->setCurrentAlpha( a ); }
1299 void showAlpha( bool b ) { cs->showAlpha( b ); }
1300
1301private slots:
1302 void addCustom();
1303
1304 void newHsv( int h, int s, int v );
1305 void newColorTypedIn( QRgb rgb );
1306 void newCustom( int, int );
1307 void newStandard( int, int );
1308private:
1309 QColorPicker *cp;
1310 QColorLuminancePicker *lp;
1311 QWellArray *custom;
1312 QWellArray *standard;
1313 QColorShower *cs;
1314 int nextCust;
1315 bool compact;
1316};
1317
981//sets all widgets to display h,s,v 1318//sets all widgets to display h,s,v
982void QColorDialogPrivate::newHsv( int h, int s, int v ) 1319void QColorDialogPrivate::newHsv( int h, int s, int v )
983{ 1320{
984 cs->setHsv( h, s, v ); 1321 cs->setHsv( h, s, v );
985 cp->setCol( h, s ); 1322 cp->setCol( h, s );
986 lp->setCol( h, s, v ); 1323 lp->setCol( h, s, v );
987} 1324}
988 1325
989//sets all widgets to display rgb 1326//sets all widgets to display rgb
990void QColorDialogPrivate::setCurrentColor( QRgb rgb ) 1327void QColorDialogPrivate::setCurrentColor( QRgb rgb )
991{ 1328{
992 cs->setRgb( rgb ); 1329 cs->setRgb( rgb );
993 newColorTypedIn( rgb ); 1330 newColorTypedIn( rgb );
994} 1331}
995 1332
996//sets all widgets exept cs to display rgb 1333//sets all widgets exept cs to display rgb
997void QColorDialogPrivate::newColorTypedIn( QRgb rgb ) 1334void QColorDialogPrivate::newColorTypedIn( QRgb rgb )
998{ 1335{
999 int h, s, v; 1336 int h, s, v;
1000 rgb2hsv(rgb, h, s, v ); 1337 rgb2hsv(rgb, h, s, v );
1001 cp->setCol( h, s ); 1338 cp->setCol( h, s );
1002 lp->setCol( h, s, v); 1339 lp->setCol( h, s, v);
1003} 1340}
1004 1341
1005void QColorDialogPrivate::newCustom( int r, int c ) 1342void QColorDialogPrivate::newCustom( int r, int c )
1006{ 1343{
1007 int i = r+2*c; 1344 int i = r+2*c;
1008 setCurrentColor( cusrgb[i] ); 1345 setCurrentColor( cusrgb[i] );
1009 nextCust = i; 1346 nextCust = i;
1010 standard->setSelected(-1,-1); 1347 standard->setSelected(-1,-1);
1011} 1348}
1012 1349
1013void QColorDialogPrivate::newStandard( int r, int c ) 1350void QColorDialogPrivate::newStandard( int r, int c )
1014{ 1351{
1015 setCurrentColor( stdrgb[r+c*6] ); 1352 setCurrentColor( stdrgb[r+c*6] );
1016 custom->setSelected(-1,-1); 1353 custom->setSelected(-1,-1);
1017} 1354}
1018 1355
1019QColorDialogPrivate::QColorDialogPrivate( QColorDialog *dialog ) : 1356QColorDialogPrivate::QColorDialogPrivate( QColorDialog *dialog ) :
1020 QObject(dialog) 1357 QObject(dialog)
1021{ 1358{
1022 compact = FALSE; 1359 compact = FALSE;
1023 // small displays (e.g. PDAs cannot fit the full color dialog, 1360 // small displays (e.g. PDAs cannot fit the full color dialog,
1024 // so just use the color picker. 1361 // so just use the color picker.
1025 if ( qApp->desktop()->width() < 480 || qApp->desktop()->height() < 350 ) 1362 if ( qApp->desktop()->width() < 480 || qApp->desktop()->height() < 350 )
1026 compact = TRUE; 1363 compact = TRUE;
1027 1364
1028 nextCust = 0; 1365 nextCust = 0;
1029 const int lumSpace = 3; 1366 const int lumSpace = 3;
1030 int border = 12; 1367 int border = 12;
1031 if ( compact ) 1368 if ( compact )
1032 border = 6; 1369 border = 6;
1033 QHBoxLayout *topLay = new QHBoxLayout( dialog, border, 6 ); 1370 QHBoxLayout *topLay = new QHBoxLayout( dialog, border, 6 );
1034 QVBoxLayout *leftLay = 0; 1371 QVBoxLayout *leftLay = 0;
1035 1372
1036 if ( !compact ) 1373 if ( !compact )
1037 leftLay = new QVBoxLayout( topLay ); 1374 leftLay = new QVBoxLayout( topLay );
1038 1375
1039 initRGB(); 1376 initRGB();
1040 1377
1041 if ( !compact ) { 1378 if ( !compact ) {
1042 standard = new QColorWell( dialog, 6, 8, stdrgb ); 1379 standard = new QColorWell( dialog, 6, 8, stdrgb );
1043 standard->setCellSize( 28, 24 ); 1380 standard->setCellSize( 28, 24 );
1044 QLabel * lab = new QLabel( standard, 1381 QLabel * lab = new QLabel( standard,
1045 QColorDialog::tr( "&Basic colors"), dialog ); 1382 QColorDialog::tr( "&Basic colors"), dialog );
1046 connect( standard, SIGNAL(selected(int,int)), SLOT(newStandard(int,int))); 1383 connect( standard, SIGNAL(selected(int,int)), SLOT(newStandard(int,int)));
1047 leftLay->addWidget( lab ); 1384 leftLay->addWidget( lab );
1048 leftLay->addWidget( standard ); 1385 leftLay->addWidget( standard );
1049 1386
1050 1387
1051 leftLay->addStretch(); 1388 leftLay->addStretch();
1052 1389
1053 custom = new QColorWell( dialog, 2, 8, cusrgb ); 1390 custom = new QColorWell( dialog, 2, 8, cusrgb );
1054 custom->setCellSize( 28, 24 ); 1391 custom->setCellSize( 28, 24 );
1055 custom->setAcceptDrops( TRUE ); 1392 custom->setAcceptDrops( TRUE );
1056 1393
1057 connect( custom, SIGNAL(selected(int,int)), SLOT(newCustom(int,int))); 1394 connect( custom, SIGNAL(selected(int,int)), SLOT(newCustom(int,int)));
1058 lab = new QLabel( custom, QColorDialog::tr( "&Custom colors") , dialog ); 1395 lab = new QLabel( custom, QColorDialog::tr( "&Custom colors") , dialog );
1059 leftLay->addWidget( lab ); 1396 leftLay->addWidget( lab );
1060 leftLay->addWidget( custom ); 1397 leftLay->addWidget( custom );
1061 1398
1062 QPushButton *custbut = 1399 QPushButton *custbut =
1063 new QPushButton( QColorDialog::tr("&Define Custom Colors >>"), 1400 new QPushButton( QColorDialog::tr("&Define Custom Colors >>"),
1064 dialog ); 1401 dialog );
1065 custbut->setEnabled( FALSE ); 1402 custbut->setEnabled( FALSE );
1066 leftLay->addWidget( custbut ); 1403 leftLay->addWidget( custbut );
1067 } else { 1404 } else {
1068 // better color picker size for small displays 1405 // better color picker size for small displays
1069 pWidth = 150; 1406 pWidth = 150;
1070 pHeight = 100; 1407 pHeight = 100;
1071 } 1408 }
1072 1409
1073 QVBoxLayout *rightLay = new QVBoxLayout( topLay ); 1410 QVBoxLayout *rightLay = new QVBoxLayout( topLay );
1074 1411
1075 QHBoxLayout *pickLay = new QHBoxLayout( rightLay ); 1412 QHBoxLayout *pickLay = new QHBoxLayout( rightLay );
1076 1413
1077 1414
1078 QVBoxLayout *cLay = new QVBoxLayout( pickLay ); 1415 QVBoxLayout *cLay = new QVBoxLayout( pickLay );
1079 cp = new QColorPicker( dialog ); 1416 cp = new QColorPicker( dialog );
1080 cp->setFrameStyle( QFrame::Panel + QFrame::Sunken ); 1417 cp->setFrameStyle( QFrame::Panel + QFrame::Sunken );
1081 cLay->addSpacing( lumSpace ); 1418 cLay->addSpacing( lumSpace );
1082 cLay->addWidget( cp ); 1419 cLay->addWidget( cp );
1083 cLay->addSpacing( lumSpace ); 1420 cLay->addSpacing( lumSpace );
1084 1421
1085 lp = new QColorLuminancePicker( dialog ); 1422 lp = new QColorLuminancePicker( dialog );
1086 lp->setFixedWidth( 20 ); //### 1423 lp->setFixedWidth( 20 ); //###
1087 pickLay->addWidget( lp ); 1424 pickLay->addWidget( lp );
1088 1425
1089 connect( cp, SIGNAL(newCol(int,int)), lp, SLOT(setCol(int,int)) ); 1426 connect( cp, SIGNAL(newCol(int,int)), lp, SLOT(setCol(int,int)) );
1090 connect( lp, SIGNAL(newHsv(int,int,int)), this, SLOT(newHsv(int,int,int)) ); 1427 connect( lp, SIGNAL(newHsv(int,int,int)), this, SLOT(newHsv(int,int,int)) );
1091 1428
1092 rightLay->addStretch(); 1429 rightLay->addStretch();
1093 1430
1094 cs = new QColorShower( dialog ); 1431 cs = new QColorShower( dialog );
1095 connect( cs, SIGNAL(newCol(QRgb)), this, SLOT(newColorTypedIn(QRgb))); 1432 connect( cs, SIGNAL(newCol(QRgb)), this, SLOT(newColorTypedIn(QRgb)));
1096 rightLay->addWidget( cs ); 1433 rightLay->addWidget( cs );
1097 1434
1098 QHBoxLayout *buttons; 1435 QHBoxLayout *buttons;
1099 if ( compact ) 1436 if ( compact )
1100 buttons = new QHBoxLayout( rightLay ); 1437 buttons = new QHBoxLayout( rightLay );
1101 else 1438 else
1102 buttons = new QHBoxLayout( leftLay ); 1439 buttons = new QHBoxLayout( leftLay );
1103 1440
1104 QPushButton *ok, *cancel; 1441 QPushButton *ok, *cancel;
1105 ok = new QPushButton( QColorDialog::tr("OK"), dialog ); 1442 ok = new QPushButton( QColorDialog::tr("OK"), dialog );
1106 connect( ok, SIGNAL(clicked()), dialog, SLOT(accept()) ); 1443 connect( ok, SIGNAL(clicked()), dialog, SLOT(accept()) );
1107 ok->setDefault(TRUE); 1444 ok->setDefault(TRUE);
1108 cancel = new QPushButton( QColorDialog::tr("Cancel"), dialog ); 1445 cancel = new QPushButton( QColorDialog::tr("Cancel"), dialog );
1109 connect( cancel, SIGNAL(clicked()), dialog, SLOT(reject()) ); 1446 connect( cancel, SIGNAL(clicked()), dialog, SLOT(reject()) );
1110 buttons->addWidget( ok ); 1447 buttons->addWidget( ok );
1111 buttons->addWidget( cancel ); 1448 buttons->addWidget( cancel );
1112 buttons->addStretch(); 1449 buttons->addStretch();
1113 1450
1114 if ( !compact ) { 1451 if ( !compact ) {
1115 QPushButton *addCusBt = new QPushButton( 1452 QPushButton *addCusBt = new QPushButton(
1116 QColorDialog::tr("&Add To Custom Colors"), 1453 QColorDialog::tr("&Add To Custom Colors"),
1117 dialog ); 1454 dialog );
1118 rightLay->addWidget( addCusBt ); 1455 rightLay->addWidget( addCusBt );
1119 connect( addCusBt, SIGNAL(clicked()), this, SLOT(addCustom()) ); 1456 connect( addCusBt, SIGNAL(clicked()), this, SLOT(addCustom()) );
1120 } 1457 }
1121} 1458}
1122 1459
1123void QColorDialogPrivate::addCustom() 1460void QColorDialogPrivate::addCustom()
1124{ 1461{
1125 cusrgb[nextCust] = cs->currentColor(); 1462 cusrgb[nextCust] = cs->currentColor();
1126 custom->repaint( FALSE ); //### 1463 custom->repaint( FALSE ); //###
1127 nextCust = (nextCust+1) % 16; 1464 nextCust = (nextCust+1) % 16;
1128} 1465}
1129 1466
1130 1467
1131// BEING REVISED: jo 1468// BEING REVISED: jo
1132/*! 1469/*!
1133 \class QColorDialog qcolordialog.h 1470 \class QColorDialog qcolordialog.h
1134 \brief The QColorDialog class provides a dialog widget for specifying colors. 1471 \brief The QColorDialog class provides a dialog widget for specifying colors.
1135 \ingroup dialogs 1472 \ingroup dialogs
1136 1473
1137 The color dialog's function is to allow users to choose colors - 1474 The color dialog's function is to allow users to choose colors -
1138 for instance, you might use this in a drawing program to allow the 1475 for instance, you might use this in a drawing program to allow the
1139 user to set the brush color. 1476 user to set the brush color.
1140 1477
1141 This version of Qt only provides modal color dialogs. The static 1478 This version of Qt only provides modal color dialogs. The static
1142 getColor() function shows the dialog and allows the user to specify a color, 1479 getColor() function shows the dialog and allows the user to specify a color,
1143 while getRgba() does the same but allows the user to specify a color with an 1480 while getRgba() does the same but allows the user to specify a color with an
@@ -1152,97 +1489,97 @@ void QColorDialogPrivate::addCustom()
1152*/ 1489*/
1153 1490
1154/*! 1491/*!
1155 Constructs a default color dialog. Use setColor() for setting an initial value. 1492 Constructs a default color dialog. Use setColor() for setting an initial value.
1156 1493
1157 \sa getColor() 1494 \sa getColor()
1158*/ 1495*/
1159 1496
1160QColorDialog::QColorDialog(QWidget* parent, const char* name, bool modal) : 1497QColorDialog::QColorDialog(QWidget* parent, const char* name, bool modal) :
1161 QDialog(parent, name, modal ) 1498 QDialog(parent, name, modal )
1162{ 1499{
1163 setSizeGripEnabled( TRUE ); 1500 setSizeGripEnabled( TRUE );
1164 d = new QColorDialogPrivate( this ); 1501 d = new QColorDialogPrivate( this );
1165} 1502}
1166 1503
1167 1504
1168/*! 1505/*!
1169 Pops up a modal color dialog letting the user choose a color and returns 1506 Pops up a modal color dialog letting the user choose a color and returns
1170 that color. The color is initially set to \a initial. Returns an \link QColor::isValid() invalid\endlink color if the user cancels 1507 that color. The color is initially set to \a initial. Returns an \link QColor::isValid() invalid\endlink color if the user cancels
1171 the dialog. All colors allocated by the dialog will be deallocated 1508 the dialog. All colors allocated by the dialog will be deallocated
1172 before this function returns. 1509 before this function returns.
1173*/ 1510*/
1174 1511
1175QColor QColorDialog::getColor( QColor initial, QWidget *parent, 1512QColor QColorDialog::getColor( QColor initial, QWidget *parent,
1176 const char *name ) 1513 const char *name )
1177{ 1514{
1178 int allocContext = QColor::enterAllocContext(); 1515 int allocContext = QColor::enterAllocContext();
1179 QColorDialog *dlg = new QColorDialog( parent, name, TRUE ); //modal 1516 QColorDialog *dlg = new QColorDialog( parent, name, TRUE ); //modal
1180 if ( parent && parent->icon() && !parent->icon()->isNull() ) 1517 if ( parent && parent->icon() && !parent->icon()->isNull() )
1181 dlg->setIcon( *parent->icon() ); 1518 dlg->setIcon( *parent->icon() );
1182 else if ( qApp->mainWidget() && qApp->mainWidget()->icon() && !qApp->mainWidget()->icon()->isNull() ) 1519 else if ( qApp->mainWidget() && qApp->mainWidget()->icon() && !qApp->mainWidget()->icon()->isNull() )
1183 dlg->setIcon( *qApp->mainWidget()->icon() ); 1520 dlg->setIcon( *qApp->mainWidget()->icon() );
1184 1521
1185 dlg->setCaption( QColorDialog::tr( "Select color" ) ); 1522 dlg->setCaption( QColorDialog::tr( "Select color" ) );
1186 dlg->setColor( initial ); 1523 dlg->setColor( initial );
1187 int resultCode = dlg->exec(); 1524 int resultCode = dlg->exec();
1188 QColor::leaveAllocContext(); 1525 QColor::leaveAllocContext();
1189 QColor result; 1526 QColor result;
1190 if ( resultCode == QDialog::Accepted ) 1527 if ( resultCode == QDialog::Accepted )
1191 result = dlg->color(); 1528 result = dlg->color();
1192 QColor::destroyAllocContext(allocContext); 1529 QColor::destroyAllocContext(allocContext);
1193 delete dlg; 1530 delete dlg;
1194 return result; 1531 return result;
1195} 1532}
1196 1533
1197 1534
1198/*! 1535/*!
1199 Pops up a modal color dialog, letting the user choose a color and an 1536 Pops up a modal color dialog, letting the user choose a color and an
1200 alpha channel value. The color+alpha is initially set to \a initial. 1537 alpha channel value. The color+alpha is initially set to \a initial.
1201 1538
1202 If \a ok is non-null, \c *ok is set to TRUE if the user clicked OK, 1539 If \a ok is non-null, \c *ok is set to TRUE if the user clicked OK,
1203 and FALSE if the user clicked Cancel. 1540 and FALSE if the user clicked Cancel.
1204 1541
1205 If the user clicks Cancel the \a initial value is returned. 1542 If the user clicks Cancel the \a initial value is returned.
1206*/ 1543*/
1207 1544
1208QRgb QColorDialog::getRgba( QRgb initial, bool *ok, 1545QRgb QColorDialog::getRgba( QRgb initial, bool *ok,
1209 QWidget *parent, const char* name ) 1546 QWidget *parent, const char* name )
1210{ 1547{
1211 int allocContext = QColor::enterAllocContext(); 1548 int allocContext = QColor::enterAllocContext();
1212 QColorDialog *dlg = new QColorDialog( parent, name, TRUE ); //modal 1549 QColorDialog *dlg = new QColorDialog( parent, name, TRUE ); //modal
1213 dlg->setColor( initial ); 1550 dlg->setColor( initial );
1214 dlg->setSelectedAlpha( qAlpha(initial) ); 1551 dlg->setSelectedAlpha( qAlpha(initial) );
1215 int resultCode = dlg->exec(); 1552 int resultCode = dlg->exec();
1216 QColor::leaveAllocContext(); 1553 QColor::leaveAllocContext();
1217 QRgb result = initial; 1554 QRgb result = initial;
1218 if ( resultCode == QDialog::Accepted ) { 1555 if ( resultCode == QDialog::Accepted ) {
1219 QRgb c = dlg->color().rgb(); 1556 QRgb c = dlg->color().rgb();
1220 int alpha = dlg->selectedAlpha(); 1557 int alpha = dlg->selectedAlpha();
1221 result = qRgba( qRed(c), qGreen(c), qBlue(c), alpha ); 1558 result = qRgba( qRed(c), qGreen(c), qBlue(c), alpha );
1222 } 1559 }
1223 if ( ok ) 1560 if ( ok )
1224 *ok = resultCode == QDialog::Accepted; 1561 *ok = resultCode == QDialog::Accepted;
1225 1562
1226 QColor::destroyAllocContext(allocContext); 1563 QColor::destroyAllocContext(allocContext);
1227 delete dlg; 1564 delete dlg;
1228 return result; 1565 return result;
1229} 1566}
1230 1567
1231 1568
1232 1569
1233 1570
1234 1571
1235/*! 1572/*!
1236 Returns the color currently selected in the dialog. 1573 Returns the color currently selected in the dialog.
1237 1574
1238 \sa setColor() 1575 \sa setColor()
1239*/ 1576*/
1240 1577
1241QColor QColorDialog::color() const 1578QColor QColorDialog::color() const
1242{ 1579{
1243 return QColor(d->currentColor()); 1580 return QColor(d->currentColor());
1244} 1581}
1245 1582
1246 1583
1247/*! Destructs the dialog and frees any memory it allocated. 1584/*! Destructs the dialog and frees any memory it allocated.
1248 1585
@@ -1269,24 +1606,25 @@ void QColorDialog::setColor( QColor c )
1269 1606
1270 1607
1271/*! 1608/*!
1272 Sets the initial alpha channel value to \a a, and show the alpha channel 1609 Sets the initial alpha channel value to \a a, and show the alpha channel
1273 entry box. 1610 entry box.
1274*/ 1611*/
1275 1612
1276void QColorDialog::setSelectedAlpha( int a ) 1613void QColorDialog::setSelectedAlpha( int a )
1277{ 1614{
1278 d->showAlpha( TRUE ); 1615 d->showAlpha( TRUE );
1279 d->setCurrentAlpha( a ); 1616 d->setCurrentAlpha( a );
1280} 1617}
1281 1618
1282 1619
1283/*! 1620/*!
1284 Returns the value selected for the alpha channel. 1621 Returns the value selected for the alpha channel.
1285*/ 1622*/
1286 1623
1287int QColorDialog::selectedAlpha() const 1624int QColorDialog::selectedAlpha() const
1288{ 1625{
1289 return d->currentAlpha(); 1626 return d->currentAlpha();
1290} 1627}
1291 1628
1292 1629
1630#include "qcolordialog.moc" \ No newline at end of file
diff --git a/libqtaux/qcolordialog.h b/libqtaux/qcolordialog.h
index 50c6482..89c6283 100644
--- a/libqtaux/qcolordialog.h
+++ b/libqtaux/qcolordialog.h
@@ -21,375 +21,64 @@
21** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition 21** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
22** licenses may use this file in accordance with the Qt Commercial License 22** licenses may use this file in accordance with the Qt Commercial License
23** Agreement provided with the Software. 23** Agreement provided with the Software.
24** 24**
25** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 25** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
26** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 26** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
27** 27**
28** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for 28** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
29** information about Qt Commercial License Agreements. 29** information about Qt Commercial License Agreements.
30** See http://www.trolltech.com/qpl/ for QPL licensing information. 30** See http://www.trolltech.com/qpl/ for QPL licensing information.
31** See http://www.trolltech.com/gpl/ for GPL licensing information. 31** See http://www.trolltech.com/gpl/ for GPL licensing information.
32** 32**
33** Contact info@trolltech.com if any conditions of this licensing are 33** Contact info@trolltech.com if any conditions of this licensing are
34** not clear to you. 34** not clear to you.
35** 35**
36**********************************************************************/ 36**********************************************************************/
37 37
38#ifndef QCOLORDIALOG_H 38#ifndef QCOLORDIALOG_H
39#define QCOLORDIALOG_H 39#define QCOLORDIALOG_H
40 40
41#ifndef QT_H 41#ifndef QT_H
42#include <qdialog.h> 42#include <qdialog.h>
43#endif // QT_H 43#endif // QT_H
44 44
45#include <qlabel.h>
46#include <qlineedit.h>
47#include <qtableview.h>
48#include <qvalidator.h>
49
50struct QWellArrayData;
51
52class QWellArray : public QTableView
53{
54 Q_OBJECT
55// Q_PROPERTY( int numCols READ numCols )
56// Q_PROPERTY( int numRows READ numRows )
57// Q_PROPERTY( int selectedColumn READ selectedColumn )
58// Q_PROPERTY( int selectedRow READ selectedRow )
59
60public:
61 QWellArray( QWidget *parent=0, const char *name=0, bool popup = FALSE );
62
63 ~QWellArray() {}
64 QString cellContent( int row, int col ) const;
65 // ### Paul !!! virtual void setCellContent( int row, int col, const QString &);
66
67 // ##### Obsolete since not const
68 int numCols() { return nCols; }
69 int numRows() { return nRows; }
70
71 int numCols() const { return nCols; }
72 int numRows() const { return nRows; }
73
74 // ##### Obsolete since not const
75 int selectedColumn() { return selCol; }
76 int selectedRow() { return selRow; }
77
78 int selectedColumn() const { return selCol; }
79 int selectedRow() const { return selRow; }
80
81 virtual void setSelected( int row, int col );
82
83 void setCellSize( int w, int h ) { setCellWidth(w);setCellHeight( h ); }
84
85 QSize sizeHint() const;
86
87 virtual void setDimension( int rows, int cols );
88 virtual void setCellBrush( int row, int col, const QBrush & );
89 QBrush cellBrush( int row, int col );
90
91signals:
92 void selected( int row, int col );
93
94protected:
95 virtual void setCurrent( int row, int col );
96
97 virtual void drawContents( QPainter *, int row, int col, const QRect& );
98 void drawContents( QPainter * );
99
100 void paintCell( QPainter*, int row, int col );
101 void mousePressEvent( QMouseEvent* );
102 void mouseReleaseEvent( QMouseEvent* );
103 void mouseMoveEvent( QMouseEvent* );
104 void keyPressEvent( QKeyEvent* );
105 void focusInEvent( QFocusEvent* );
106 void focusOutEvent( QFocusEvent* );
107
108private:
109 int curRow;
110 int curCol;
111 int selRow;
112 int selCol;
113 int nCols;
114 int nRows;
115 bool smallStyle;
116 QWellArrayData *d;
117
118private: // Disabled copy constructor and operator=
119#if defined(Q_DISABLE_COPY)
120 QWellArray( const QWellArray & );
121 QWellArray& operator=( const QWellArray & );
122#endif
123};
124
125struct QWellArrayData {
126 QBrush *brush;
127};
128
129class QColNumLineEdit : public QLineEdit
130{
131public:
132 QColNumLineEdit( QWidget *parent, const char* name = 0 )
133 : QLineEdit( parent, name ) { setMaxLength( 3 );}
134 QSize sizeHint() const {
135 return QSize( 30, //#####
136 QLineEdit::sizeHint().height() ); }
137 void setNum( int i ) {
138 QString s;
139 s.setNum(i);
140 bool block = signalsBlocked();
141 blockSignals(TRUE);
142 setText( s );
143 blockSignals(block);
144 }
145 int val() const { return text().toInt(); }
146};
147
148class QColorShowLabel : public QFrame
149{
150 Q_OBJECT
151
152public:
153 QColorShowLabel( QWidget *parent ) :QFrame( parent ) {
154 setFrameStyle( QFrame::Panel|QFrame::Sunken );
155 setBackgroundMode( PaletteBackground );
156 setAcceptDrops( TRUE );
157 mousePressed = FALSE;
158 }
159 void setColor( QColor c ) { col = c; }
160
161signals:
162 void colorDropped( QRgb );
163
164protected:
165 void drawContents( QPainter *p );
166 void mousePressEvent( QMouseEvent *e );
167 void mouseMoveEvent( QMouseEvent *e );
168 void mouseReleaseEvent( QMouseEvent *e );
169#ifndef QT_NO_DRAGANDDROP
170 void dragEnterEvent( QDragEnterEvent *e );
171 void dragLeaveEvent( QDragLeaveEvent *e );
172 void dropEvent( QDropEvent *e );
173#endif
174
175private:
176 QColor col;
177 bool mousePressed;
178 QPoint pressPos;
179
180};
181
182class QColorShower : public QWidget
183{
184 Q_OBJECT
185public:
186 QColorShower( QWidget *parent, const char *name = 0 );
187
188 //things that don't emit signals
189 void setHsv( int h, int s, int v );
190
191 int currentAlpha() const { return alphaEd->val(); }
192 void setCurrentAlpha( int a ) { alphaEd->setNum( a ); }
193 void showAlpha( bool b );
194
195
196 QRgb currentColor() const { return curCol; }
197
198public slots:
199 void setRgb( QRgb rgb );
200
201signals:
202 void newCol( QRgb rgb );
203private slots:
204 void rgbEd();
205 void hsvEd();
206private:
207 void showCurrentColor();
208 int hue, sat, val;
209 QRgb curCol;
210 QColNumLineEdit *hEd;
211 QColNumLineEdit *sEd;
212 QColNumLineEdit *vEd;
213 QColNumLineEdit *rEd;
214 QColNumLineEdit *gEd;
215 QColNumLineEdit *bEd;
216 QColNumLineEdit *alphaEd;
217 QLabel *alphaLab;
218 QColorShowLabel *lab;
219 bool rgbOriginal;
220};
221
222class QColorPicker : public QFrame
223{
224 Q_OBJECT
225public:
226 QColorPicker(QWidget* parent=0, const char* name=0);
227 ~QColorPicker();
228
229public slots:
230 void setCol( int h, int s );
231
232signals:
233 void newCol( int h, int s );
234
235protected:
236 QSize sizeHint() const;
237 QSizePolicy sizePolicy() const;
238 void drawContents(QPainter* p);
239 void mouseMoveEvent( QMouseEvent * );
240 void mousePressEvent( QMouseEvent * );
241
242private:
243 int hue;
244 int sat;
245
246 QPoint colPt();
247 int huePt( const QPoint &pt );
248 int satPt( const QPoint &pt );
249 void setCol( const QPoint &pt );
250
251 QPixmap *pix;
252};
253
254class QColorLuminancePicker : public QWidget
255{
256 Q_OBJECT
257public:
258 QColorLuminancePicker(QWidget* parent=0, const char* name=0);
259 ~QColorLuminancePicker();
260
261public slots:
262 void setCol( int h, int s, int v );
263 void setCol( int h, int s );
264
265signals:
266 void newHsv( int h, int s, int v );
267
268protected:
269// QSize sizeHint() const;
270// QSizePolicy sizePolicy() const;
271 void paintEvent( QPaintEvent*);
272 void mouseMoveEvent( QMouseEvent * );
273 void mousePressEvent( QMouseEvent * );
274
275private:
276 enum { foff = 3, coff = 4 }; //frame and contents offset
277 int val;
278 int hue;
279 int sat;
280
281 int y2val( int y );
282 int val2y( int val );
283 void setVal( int v );
284
285 QPixmap *pix;
286};
287
288class QColorWell : public QWellArray
289{
290public:
291 QColorWell( QWidget *parent, int r, int c, QRgb *vals )
292 :QWellArray( parent, "" ), values( vals ), mousePressed( FALSE ), oldCurrent( -1, -1 )
293 { setDimension(r,c); setWFlags( WResizeNoErase ); }
294 QSizePolicy sizePolicy() const;
295
296protected:
297 void drawContents( QPainter *, int row, int col, const QRect& );
298 void drawContents( QPainter *p ) { QWellArray::drawContents(p); }
299 void mousePressEvent( QMouseEvent *e );
300 void mouseMoveEvent( QMouseEvent *e );
301 void mouseReleaseEvent( QMouseEvent *e );
302#ifndef QT_NO_DRAGANDDROP
303 void dragEnterEvent( QDragEnterEvent *e );
304 void dragLeaveEvent( QDragLeaveEvent *e );
305 void dragMoveEvent( QDragMoveEvent *e );
306 void dropEvent( QDropEvent *e );
307#endif
308
309private:
310 QRgb *values;
311 bool mousePressed;
312 QPoint pressPos;
313 QPoint oldCurrent;
314
315};
316
317class QColIntValidator: public QIntValidator
318{
319public:
320 QColIntValidator( int bottom, int top,
321 QWidget * parent, const char *name = 0 )
322 :QIntValidator( bottom, top, parent, name ) {}
323
324 QValidator::State validate( QString &, int & ) const;
325};
326
327class QColorDialogPrivate; 45class QColorDialogPrivate;
328 46
329class Q_EXPORT QColorDialog : public QDialog 47class Q_EXPORT QColorDialog : public QDialog
330{ 48{
331 Q_OBJECT 49 Q_OBJECT
332 50
333public: 51public:
334 static QColor getColor( QColor, QWidget *parent=0, const char* name=0 ); // ### 3.0: make const QColor& 52 static QColor getColor( QColor, QWidget *parent=0, const char* name=0 ); // ### 3.0: make const QColor&
335 static QRgb getRgba( QRgb, bool* ok = 0, 53 static QRgb getRgba( QRgb, bool* ok = 0,
336 QWidget *parent=0, const char* name=0 ); 54 QWidget *parent=0, const char* name=0 );
337 55
338 56
339 static int customCount(); 57 static int customCount();
340 static QRgb customColor( int ); 58 static QRgb customColor( int );
341 static void setCustomColor( int, QRgb ); 59 static void setCustomColor( int, QRgb );
342 60
343private: 61private:
344 ~QColorDialog(); 62 ~QColorDialog();
345 63
346 QColorDialog( QWidget* parent=0, const char* name=0, bool modal=FALSE ); 64 QColorDialog( QWidget* parent=0, const char* name=0, bool modal=FALSE );
347 void setColor( QColor ); // ### 3.0: make const QColor& 65 void setColor( QColor ); // ### 3.0: make const QColor&
348 QColor color() const; 66 QColor color() const;
349 67
350private: 68private:
351 void setSelectedAlpha( int ); 69 void setSelectedAlpha( int );
352 int selectedAlpha() const; 70 int selectedAlpha() const;
353 71
354 void showCustom( bool=TRUE ); 72 void showCustom( bool=TRUE );
355private: 73private:
356 QColorDialogPrivate *d; 74 QColorDialogPrivate *d;
357 friend class QColorDialogPrivate; 75 friend class QColorDialogPrivate;
358 76
359private: // Disabled copy constructor and operator= 77 private:// Disabled copy constructor and operator=
360#if defined(Q_DISABLE_COPY) 78#if defined(Q_DISABLE_COPY)
361 QColorDialog( const QColorDialog & ); 79 QColorDialog( const QColorDialog & );
362 QColorDialog& operator=( const QColorDialog & ); 80 QColorDialog& operator=( const QColorDialog & );
363#endif 81#endif
364}; 82};
365 83
366class QColorDialogPrivate : public QObject
367{
368Q_OBJECT
369public:
370 QColorDialogPrivate( QColorDialog *p );
371 QRgb currentColor() const { return cs->currentColor(); }
372 void setCurrentColor( QRgb rgb );
373
374 int currentAlpha() const { return cs->currentAlpha(); }
375 void setCurrentAlpha( int a ) { cs->setCurrentAlpha( a ); }
376 void showAlpha( bool b ) { cs->showAlpha( b ); }
377
378private slots:
379 void addCustom();
380
381 void newHsv( int h, int s, int v );
382 void newColorTypedIn( QRgb rgb );
383 void newCustom( int, int );
384 void newStandard( int, int );
385private:
386 QColorPicker *cp;
387 QColorLuminancePicker *lp;
388 QWellArray *custom;
389 QWellArray *standard;
390 QColorShower *cs;
391 int nextCust;
392 bool compact;
393};
394
395#endif 84#endif