| -rw-r--r-- | core/pim/today/changelog | 1 | ||||
| -rw-r--r-- | core/pim/today/todaybase.cpp | 51 |
2 files changed, 28 insertions, 24 deletions
diff --git a/core/pim/today/changelog b/core/pim/today/changelog index 2270551..b3da1fb 100644 --- a/core/pim/today/changelog +++ b/core/pim/today/changelog @@ -2,2 +2,3 @@ +* fixed the wrong color of the buttons * better translation (thanks carsten and others) diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp index dfcc34e..755c860 100644 --- a/core/pim/today/todaybase.cpp +++ b/core/pim/today/todaybase.cpp @@ -34,5 +34,5 @@ -/* - * Constructs a TodayBase which is a child of 'parent', with the - * name 'name' and widget flags set to 'f' +/* + * Constructs a TodayBase which is a child of 'parent', with the + * name 'name' and widget flags set to 'f' */ @@ -46,3 +46,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) QPixmap mail = Resource::loadPixmap( "today/mail" ); // mail icon - + QPalette pal = this->palette(); @@ -50,2 +50,5 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) pal.setColor(QPalette::Active, QColorGroup::Button, col); + pal.setColor(QPalette::Inactive, QColorGroup::Button, col); + pal.setColor(QPalette::Normal, QColorGroup::Button, col); + pal.setColor(QPalette::Disabled, QColorGroup::Button, col); this->setPalette(pal); @@ -54,6 +57,6 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) QWidget *d = QApplication::desktop(); - int w=d->width(); - int h=d->height(); - resize( w , h ); - + int w=d->width(); + int h=d->height(); + resize( w , h ); + // hehe, qt is ... @@ -80,9 +83,9 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) TextLabel1 = new QLabel( Frame, "TextLabel1" ); - TextLabel1->setGeometry( QRect( 10, 35, 168, 12 ) ); + TextLabel1->setGeometry( QRect( 10, 35, 168, 12 ) ); QFont TextLabel1_font( TextLabel1->font() ); TextLabel1_font.setBold( TRUE ); - TextLabel1->setFont( TextLabel1_font ); + TextLabel1->setFont( TextLabel1_font ); TextLabel1->setBackgroundOrigin( QLabel::ParentOrigin ); TextLabel1->setTextFormat( RichText ); - + OwnerField = new QLabel(this , "Owner" ); @@ -91,3 +94,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) OwnerField->setMaximumHeight(12); - + // --- dates section --- @@ -99,4 +102,4 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) Frame4->setFrameStyle( QFrame::NoFrame ); - Frame4->setGeometry (QRect( 0, 8, this->width() , this->height()) ); - + Frame4->setGeometry (QRect( 0, 8, this->width() , this->height()) ); + sv1 = new QScrollView( Frame4 ); @@ -105,5 +108,5 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) // need to find a better way!!! - sv1->setGeometry (QRect( 40, 2, Frame4->width()-40 , (Frame4->height()/3)+20 ) ); + sv1->setGeometry (QRect( 40, 2, Frame4->width()-40 , (Frame4->height()/3)+20 ) ); sv1->setFrameShape(QFrame::NoFrame); - + DatesButton = new QPushButton (Frame4, "DatesButton" ); @@ -114,3 +117,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) DatesButton->setFlat( TRUE ); - + // --- mail section ---) @@ -118,5 +121,5 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) MailFrame->setBackgroundOrigin( QScrollView::ParentOrigin ); - MailFrame->setGeometry (QRect( 0, 0, this->width() , 15) ); + MailFrame->setGeometry (QRect( 0, 0, this->width() , 15) ); MailFrame->setFrameStyle( QFrame::NoFrame ); - + QFrame* Line1 = new QFrame( MailFrame); @@ -132,3 +135,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) MailField = new QLabel( MailFrame, "MailField" ); - MailField->setGeometry( QRect( 40, 4, MailFrame->width(), 12) ); + MailField->setGeometry( QRect( 40, 4, MailFrame->width(), 12) ); MailField->setText( tr( "Opiemail not installed" ) ); @@ -141,3 +144,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) Frame15->setFrameStyle( QFrame::NoFrame ); - Frame15->setGeometry (QRect( 40, 3, this->width() , this->height()) ); + Frame15->setGeometry (QRect( 40, 3, this->width() , this->height()) ); @@ -156,3 +159,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) sv2->setHScrollBarMode( QScrollView::AlwaysOff ); - sv2->setGeometry (QRect( 40, 3, Frame15->width()-40 , (Frame15->height()/3) ) ); + sv2->setGeometry (QRect( 40, 3, Frame15->width()-40 , (Frame15->height()/3) ) ); sv2->setFrameShape(QFrame::NoFrame); @@ -166,3 +169,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) PushButton1 = new QPushButton (Frame15, "PushButton1" ); - PushButton1->setGeometry( QRect( 2, 68, 25, 21 ) ); + PushButton1->setGeometry( QRect( 2, 68, 25, 21 ) ); PushButton1->setPixmap( config ); @@ -184,3 +187,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) -/* +/* * Destroys the object and frees any allocated resources |