Mercurial > octave

annotate libgui/src/color-picker.cc @ 16621:2df11dd7a589

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
draw border around color picker swatches * color-picker.cc (color_picker::update_button): Add 1px solid border with text color to the css for the button.
author John W. Eaton <jwe@octave.org>
date Mon, 06 May 2013 06:06:43 -0400
parents a1f613e5066d
children e2de3c8882be
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
16402
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
1 //
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
2 // This class provides a simple color picker based on tQColorButton
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
3 // by Harald Jedele, 23.03.01, GPL version 2 or any later version.
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
4 //
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
5 // Copyright (C) FZI Forschungszentrum Informatik Karlsruhe
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
6 // Copyright (C) 2013 Torsten <ttl@justmail.de>
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
7 //
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
8 // This file is part of Octave.
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
9 //
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
10 // Octave is free software; you can redistribute it and/or modify it
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
11 // under the terms of the GNU General Public License as published by the
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
12 // Free Software Foundation; either version 3 of the License, or (at your
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
13 // option) any later version.
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
14 //
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
15 // Octave is distributed in the hope that it will be useful, but WITHOUT
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
16 // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
17 // FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
18 // for more details.
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
19 //
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
20 // You should have received a copy of the GNU General Public License
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
21 // along with Octave; see the file COPYING. If not, see
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
22 // <http://www.gnu.org/licenses/>.
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
23 //
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
24
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
25 #include "color-picker.h"
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
26
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
27 // constuctor with initial color as parameter
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
28 color_picker::color_picker (QColor old_color, QWidget* p) : QPushButton (p)
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
29 {
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
30 _color = old_color;
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
31 setFlat (true);
16610
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013)
Torsten <ttl@justmail.de>
parents: 16402
diff changeset
32 setFocusPolicy(Qt::NoFocus); // no focus, would changes the color
16402
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
33 update_button ();
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
34 connect(this, SIGNAL (clicked ()), SLOT (select_color ()));
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
35 }
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
36
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
37 // slot for bitton clicked: selct a new color using QColorDialog
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
38 void
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
39 color_picker::select_color ()
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
40 {
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
41 QColor new_color = QColorDialog::getColor (_color);
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
42 if (new_color.isValid () && new_color != _color)
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
43 {
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
44 _color = new_color;
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
45 update_button ();
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
46 }
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
47 }
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
48
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
49 // draw the button with the actual color (using a stylesheet)
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
50 void color_picker::update_button ()
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
51 {
16621
2df11dd7a589 draw border around color picker swatches
John W. Eaton <jwe@octave.org>
parents: 16610
diff changeset
52 // Is this the right place to look for a "foreground" color that would
2df11dd7a589 draw border around color picker swatches
John W. Eaton <jwe@octave.org>
parents: 16610
diff changeset
53 // provide a reasonable border for the color swatches?
2df11dd7a589 draw border around color picker swatches
John W. Eaton <jwe@octave.org>
parents: 16610
diff changeset
54 QWidget *p = parentWidget ();
2df11dd7a589 draw border around color picker swatches
John W. Eaton <jwe@octave.org>
parents: 16610
diff changeset
55
2df11dd7a589 draw border around color picker swatches
John W. Eaton <jwe@octave.org>
parents: 16610
diff changeset
56 QString bordercolor
2df11dd7a589 draw border around color picker swatches
John W. Eaton <jwe@octave.org>
parents: 16610
diff changeset
57 = p ? p->palette().text().color().name() : QString ("#000000");
2df11dd7a589 draw border around color picker swatches
John W. Eaton <jwe@octave.org>
parents: 16610
diff changeset
58
2df11dd7a589 draw border around color picker swatches
John W. Eaton <jwe@octave.org>
parents: 16610
diff changeset
59 QString css = QString("background-color: %1; border: 1px solid %2;")
2df11dd7a589 draw border around color picker swatches
John W. Eaton <jwe@octave.org>
parents: 16610
diff changeset
60 .arg(_color.name())
2df11dd7a589 draw border around color picker swatches
John W. Eaton <jwe@octave.org>
parents: 16610
diff changeset
61 .arg(bordercolor);
2df11dd7a589 draw border around color picker swatches
John W. Eaton <jwe@octave.org>
parents: 16610
diff changeset
62
16402
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
63 setStyleSheet(css);
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
64 repaint ();
7fa90eb41240 gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
diff changeset
65 }