summaryrefslogtreecommitdiff
path: root/noncore/settings
authordrw <drw>2002-12-05 17:13:45 (UTC)
committer drw <drw>2002-12-05 17:13:45 (UTC)
commit675ab68194cc25793a18fd9e495958a90aaf0173 (patch) (unidiff)
treee2599a7dbef3184f015593f0b7ffe533c45a5ba5 /noncore/settings
parent1eb333726ccf7c608b9f987aac1a04d37d35936c (diff)
downloadopie-675ab68194cc25793a18fd9e495958a90aaf0173.zip
opie-675ab68194cc25793a18fd9e495958a90aaf0173.tar.gz
opie-675ab68194cc25793a18fd9e495958a90aaf0173.tar.bz2
Modified OColorButton to pass color to color dialog. Impacts appearance, launcher settings and liquid settings.
Diffstat (limited to 'noncore/settings') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/appearance2/editScheme.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/noncore/settings/appearance2/editScheme.cpp b/noncore/settings/appearance2/editScheme.cpp
index c2e5355..eefeccc 100644
--- a/noncore/settings/appearance2/editScheme.cpp
+++ b/noncore/settings/appearance2/editScheme.cpp
@@ -37,32 +37,31 @@
37#include <qscrollview.h> 37#include <qscrollview.h>
38#include <qtoolbutton.h> 38#include <qtoolbutton.h>
39 39
40EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent, const char* name, bool modal, WFlags fl ) 40EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent, const char* name, bool modal, WFlags fl )
41 : QDialog ( parent, name, modal, fl ) 41 : QDialog ( parent, name, modal, fl )
42{ 42{
43 setCaption ( tr( "Edit scheme" ) ); 43 setCaption ( tr( "Edit scheme" ) );
44 QGridLayout *layout = new QGridLayout ( this, 0, 0, 4, 4 ); 44 QGridLayout *layout = new QGridLayout ( this, 0, 0, 4, 4 );
45 45
46 m_count = cnt; 46 m_count = cnt;
47 m_buttons = new OColorButton * [cnt]; 47 m_buttons = new OColorButton * [cnt];
48 m_colors = colors; 48 m_colors = colors;
49 49
50 for ( int i = 0; i < cnt; i++ ) 50 for ( int i = 0; i < cnt; i++ )
51 { 51 {
52 QLabel *l = new QLabel ( labels [i], this ); 52 QLabel *l = new QLabel ( labels [i], this );
53 layout-> addWidget ( l, i, 0 ); 53 layout-> addWidget ( l, i, 0 );
54 54
55 m_buttons [i] = new OColorButton ( this ); 55 m_buttons [i] = new OColorButton ( this, colors [i] );
56 m_buttons [i]-> setColor ( colors [i] );
57 layout-> addWidget ( m_buttons [i], i, 1 ); 56 layout-> addWidget ( m_buttons [i], i, 1 );
58 } 57 }
59} 58}
60 59
61EditScheme::~EditScheme ( ) 60EditScheme::~EditScheme ( )
62{ 61{
63 delete [] m_buttons; 62 delete [] m_buttons;
64} 63}
65 64
66void EditScheme::accept ( ) 65void EditScheme::accept ( )
67{ 66{
68 for ( int i = 0; i < m_count; i++ ) 67 for ( int i = 0; i < m_count; i++ )