summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/changelog1
-rw-r--r--core/pim/today/todaybase.cpp51
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 @@
2 2
3* fixed the wrong color of the buttons
3* better translation (thanks carsten and others) 4* 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 @@
34 34
35/* 35/*
36 * Constructs a TodayBase which is a child of 'parent', with the 36 * Constructs a TodayBase which is a child of 'parent', with the
37 * name 'name' and widget flags set to 'f' 37 * name 'name' and widget flags set to 'f'
38 */ 38 */
@@ -46,3 +46,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
46 QPixmap mail = Resource::loadPixmap( "today/mail" ); // mail icon 46 QPixmap mail = Resource::loadPixmap( "today/mail" ); // mail icon
47 47
48 QPalette pal = this->palette(); 48 QPalette pal = this->palette();
@@ -50,2 +50,5 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
50 pal.setColor(QPalette::Active, QColorGroup::Button, col); 50 pal.setColor(QPalette::Active, QColorGroup::Button, col);
51 pal.setColor(QPalette::Inactive, QColorGroup::Button, col);
52 pal.setColor(QPalette::Normal, QColorGroup::Button, col);
53 pal.setColor(QPalette::Disabled, QColorGroup::Button, col);
51 this->setPalette(pal); 54 this->setPalette(pal);
@@ -54,6 +57,6 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
54 QWidget *d = QApplication::desktop(); 57 QWidget *d = QApplication::desktop();
55 int w=d->width(); 58 int w=d->width();
56 int h=d->height(); 59 int h=d->height();
57 resize( w , h ); 60 resize( w , h );
58 61
59 // hehe, qt is ... 62 // hehe, qt is ...
@@ -80,9 +83,9 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
80 TextLabel1 = new QLabel( Frame, "TextLabel1" ); 83 TextLabel1 = new QLabel( Frame, "TextLabel1" );
81 TextLabel1->setGeometry( QRect( 10, 35, 168, 12 ) ); 84 TextLabel1->setGeometry( QRect( 10, 35, 168, 12 ) );
82 QFont TextLabel1_font( TextLabel1->font() ); 85 QFont TextLabel1_font( TextLabel1->font() );
83 TextLabel1_font.setBold( TRUE ); 86 TextLabel1_font.setBold( TRUE );
84 TextLabel1->setFont( TextLabel1_font ); 87 TextLabel1->setFont( TextLabel1_font );
85 TextLabel1->setBackgroundOrigin( QLabel::ParentOrigin ); 88 TextLabel1->setBackgroundOrigin( QLabel::ParentOrigin );
86 TextLabel1->setTextFormat( RichText ); 89 TextLabel1->setTextFormat( RichText );
87 90
88 OwnerField = new QLabel(this , "Owner" ); 91 OwnerField = new QLabel(this , "Owner" );
@@ -91,3 +94,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
91 OwnerField->setMaximumHeight(12); 94 OwnerField->setMaximumHeight(12);
92 95
93 // --- dates section --- 96 // --- dates section ---
@@ -99,4 +102,4 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
99 Frame4->setFrameStyle( QFrame::NoFrame ); 102 Frame4->setFrameStyle( QFrame::NoFrame );
100 Frame4->setGeometry (QRect( 0, 8, this->width() , this->height()) ); 103 Frame4->setGeometry (QRect( 0, 8, this->width() , this->height()) );
101 104
102 sv1 = new QScrollView( Frame4 ); 105 sv1 = new QScrollView( Frame4 );
@@ -105,5 +108,5 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
105 // need to find a better way!!! 108 // need to find a better way!!!
106 sv1->setGeometry (QRect( 40, 2, Frame4->width()-40 , (Frame4->height()/3)+20 ) ); 109 sv1->setGeometry (QRect( 40, 2, Frame4->width()-40 , (Frame4->height()/3)+20 ) );
107 sv1->setFrameShape(QFrame::NoFrame); 110 sv1->setFrameShape(QFrame::NoFrame);
108 111
109 DatesButton = new QPushButton (Frame4, "DatesButton" ); 112 DatesButton = new QPushButton (Frame4, "DatesButton" );
@@ -114,3 +117,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
114 DatesButton->setFlat( TRUE ); 117 DatesButton->setFlat( TRUE );
115 118
116 // --- mail section ---) 119 // --- mail section ---)
@@ -118,5 +121,5 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
118 MailFrame->setBackgroundOrigin( QScrollView::ParentOrigin ); 121 MailFrame->setBackgroundOrigin( QScrollView::ParentOrigin );
119 MailFrame->setGeometry (QRect( 0, 0, this->width() , 15) ); 122 MailFrame->setGeometry (QRect( 0, 0, this->width() , 15) );
120 MailFrame->setFrameStyle( QFrame::NoFrame ); 123 MailFrame->setFrameStyle( QFrame::NoFrame );
121 124
122 QFrame* Line1 = new QFrame( MailFrame); 125 QFrame* Line1 = new QFrame( MailFrame);
@@ -132,3 +135,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
132 MailField = new QLabel( MailFrame, "MailField" ); 135 MailField = new QLabel( MailFrame, "MailField" );
133 MailField->setGeometry( QRect( 40, 4, MailFrame->width(), 12) ); 136 MailField->setGeometry( QRect( 40, 4, MailFrame->width(), 12) );
134 MailField->setText( tr( "Opiemail not installed" ) ); 137 MailField->setText( tr( "Opiemail not installed" ) );
@@ -141,3 +144,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
141 Frame15->setFrameStyle( QFrame::NoFrame ); 144 Frame15->setFrameStyle( QFrame::NoFrame );
142 Frame15->setGeometry (QRect( 40, 3, this->width() , this->height()) ); 145 Frame15->setGeometry (QRect( 40, 3, this->width() , this->height()) );
143 146
@@ -156,3 +159,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
156 sv2->setHScrollBarMode( QScrollView::AlwaysOff ); 159 sv2->setHScrollBarMode( QScrollView::AlwaysOff );
157 sv2->setGeometry (QRect( 40, 3, Frame15->width()-40 , (Frame15->height()/3) ) ); 160 sv2->setGeometry (QRect( 40, 3, Frame15->width()-40 , (Frame15->height()/3) ) );
158 sv2->setFrameShape(QFrame::NoFrame); 161 sv2->setFrameShape(QFrame::NoFrame);
@@ -166,3 +169,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
166 PushButton1 = new QPushButton (Frame15, "PushButton1" ); 169 PushButton1 = new QPushButton (Frame15, "PushButton1" );
167 PushButton1->setGeometry( QRect( 2, 68, 25, 21 ) ); 170 PushButton1->setGeometry( QRect( 2, 68, 25, 21 ) );
168 PushButton1->setPixmap( config ); 171 PushButton1->setPixmap( config );
@@ -184,3 +187,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
184 187
185/* 188/*
186 * Destroys the object and frees any allocated resources 189 * Destroys the object and frees any allocated resources