author | harlekin <harlekin> | 2002-02-17 23:48:36 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-02-17 23:48:36 (UTC) |
commit | 0640b30f13beb9d6480d8042ec5397a68e6247fc (patch) (unidiff) | |
tree | b632bdf355ed17bbce94470cadeb31570b5186c8 | |
parent | 39c6f8a9e734f200de4b67f55e159a6ccce38940 (diff) | |
download | opie-0640b30f13beb9d6480d8042ec5397a68e6247fc.zip opie-0640b30f13beb9d6480d8042ec5397a68e6247fc.tar.gz opie-0640b30f13beb9d6480d8042ec5397a68e6247fc.tar.bz2 |
fixes boxes arround icons
-rw-r--r-- | core/pim/today/todaybase.cpp | 44 | ||||
-rw-r--r-- | core/pim/today/todaybase.h | 2 |
2 files changed, 30 insertions, 16 deletions
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp index 9331ee3..b0de1bf 100644 --- a/core/pim/today/todaybase.cpp +++ b/core/pim/today/todaybase.cpp | |||
@@ -52,5 +52,13 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) | |||
52 | 52 | ||
53 | //if ( !name ) | 53 | QPalette pal2; |
54 | // setName( "TodayBase" ); | 54 | QColorGroup cg; |
55 | //resize( 223, 307 ); | 55 | cg.setColor( QColorGroup::Text, white ); |
56 | cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230), logo ) ); | ||
57 | pal2.setActive( cg ); | ||
58 | |||
59 | |||
60 | QPalette pal = this->palette(); | ||
61 | QColor col = pal.color(QPalette::Active, QColorGroup::Background); | ||
62 | pal.setColor(QPalette::Active, QColorGroup::Button, col); | ||
63 | this->setPalette(pal); | ||
56 | 64 | ||
@@ -58,2 +66,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) | |||
58 | 66 | ||
67 | |||
59 | Frame4 = new QFrame( this, "Frame4" ); | 68 | Frame4 = new QFrame( this, "Frame4" ); |
@@ -70,2 +79,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) | |||
70 | DatesButton->setBackgroundOrigin( QPushButton::WidgetOrigin ); | 79 | DatesButton->setBackgroundOrigin( QPushButton::WidgetOrigin ); |
80 | DatesButton->setPalette( pal ); | ||
71 | DatesButton->setPixmap( datebook ); | 81 | DatesButton->setPixmap( datebook ); |
@@ -80,9 +90,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) | |||
80 | Frame = new QLabel( this, "Frame" ); | 90 | Frame = new QLabel( this, "Frame" ); |
81 | QPalette pal; | 91 | Frame->setPalette( pal2 ); |
82 | QColorGroup cg; | ||
83 | cg.setColor( QColorGroup::Text, white ); | ||
84 | cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230), logo ) ); | ||
85 | pal.setActive( cg ); | ||
86 | |||
87 | Frame->setPalette( pal ); | ||
88 | Frame->setFrameShape( QFrame::StyledPanel ); | 92 | Frame->setFrameShape( QFrame::StyledPanel ); |
@@ -92,5 +96,5 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) | |||
92 | Frame->setMinimumHeight(50); | 96 | Frame->setMinimumHeight(50); |
97 | |||
93 | // date | 98 | // date |
94 | TextLabel1 = new QLabel( Frame, "TextLabel1" ); | 99 | TextLabel1 = new QLabel( Frame, "TextLabel1" ); |
95 | TextLabel1->setPalette( pal ); | ||
96 | TextLabel1->setGeometry( QRect( 10, 35, 168, 12 ) ); | 100 | TextLabel1->setGeometry( QRect( 10, 35, 168, 12 ) ); |
@@ -109,3 +113,5 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) | |||
109 | TodoButton->setGeometry( QRect( 2, 4, 36, 32 ) ); | 113 | TodoButton->setGeometry( QRect( 2, 4, 36, 32 ) ); |
110 | TodoButton->setBackgroundOrigin( QPushButton::WidgetOrigin ); | 114 | //TodoButton->setBackgroundMode(NoBackground); |
115 | TodoButton->setPalette( pal ); | ||
116 | //TodoButton->setBackgroundOrigin( QPushButton::WidgetOrigin ); | ||
111 | TodoButton->setPixmap( todo ); | 117 | TodoButton->setPixmap( todo ); |
@@ -121,4 +127,5 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) | |||
121 | PushButton1->setGeometry( QRect( 216, 68, 25, 21 ) ); | 127 | PushButton1->setGeometry( QRect( 216, 68, 25, 21 ) ); |
122 | PushButton1->setBackgroundOrigin( QPushButton::WidgetOrigin ); | 128 | //PushButton1->setBackgroundOrigin( QPushButton::WidgetOrigin ); |
123 | PushButton1->setPixmap( config ); | 129 | PushButton1->setPixmap( config ); |
130 | PushButton1->setPalette( pal ); | ||
124 | PushButton1->setAutoDefault( TRUE ); | 131 | PushButton1->setAutoDefault( TRUE ); |
@@ -130,3 +137,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) | |||
130 | MailFrame->setFrameShadow( QScrollView::Sunken ); | 137 | MailFrame->setFrameShadow( QScrollView::Sunken ); |
131 | MailFrame->setBackgroundOrigin( QScrollView::ParentOrigin ); | 138 | //MailFrame->setBackgroundOrigin( QScrollView::ParentOrigin ); |
132 | 139 | ||
@@ -134,3 +141,4 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) | |||
134 | MailButton->setGeometry( QRect( 2, 10, 36, 19 ) ); | 141 | MailButton->setGeometry( QRect( 2, 10, 36, 19 ) ); |
135 | MailButton->setBackgroundOrigin( QPushButton::WidgetOrigin ); | 142 | //MailButton->setBackgroundOrigin( QPushButton::WidgetOrigin ); |
143 | MailButton->setPalette( pal ); | ||
136 | MailButton->setPixmap( mail ); | 144 | MailButton->setPixmap( mail ); |
@@ -145,2 +153,5 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) | |||
145 | 153 | ||
154 | |||
155 | |||
156 | |||
146 | layout->addWidget(Frame); | 157 | layout->addWidget(Frame); |
@@ -149,2 +160,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) | |||
149 | layout->addWidget(Frame15); | 160 | layout->addWidget(Frame15); |
161 | //layout->addWidget(split); | ||
150 | 162 | ||
@@ -160,3 +172,3 @@ TodayBase::~TodayBase() | |||
160 | { | 172 | { |
161 | // no need to delete child widgets, Qt does it all for us | 173 | |
162 | } | 174 | } |
diff --git a/core/pim/today/todaybase.h b/core/pim/today/todaybase.h index 15f021a..c84cc67 100644 --- a/core/pim/today/todaybase.h +++ b/core/pim/today/todaybase.h | |||
@@ -14,2 +14,3 @@ | |||
14 | #include <qscrollview.h> | 14 | #include <qscrollview.h> |
15 | #include <qsplitter.h> | ||
15 | 16 | ||
@@ -46,2 +47,3 @@ protected: | |||
46 | 47 | ||
48 | |||
47 | }; | 49 | }; |