author | harlekin <harlekin> | 2002-02-20 20:04:58 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-02-20 20:04:58 (UTC) |
commit | 17e96f64d6b66fac5f0e206492149d461e2ad900 (patch) (unidiff) | |
tree | a2af1d60dc0a44e6e7991fc25d5ed8d9646e3620 /core/pim/today/todaybase.cpp | |
parent | f5ce2ee04b4b9aed2a93e9a730ad22ced791dfd8 (diff) | |
download | opie-17e96f64d6b66fac5f0e206492149d461e2ad900.zip opie-17e96f64d6b66fac5f0e206492149d461e2ad900.tar.gz opie-17e96f64d6b66fac5f0e206492149d461e2ad900.tar.bz2 |
new release fixing several bugs, look at changelog .-)
-rw-r--r-- | core/pim/today/todaybase.cpp | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp index b0de1bf..32b45f7 100644 --- a/core/pim/today/todaybase.cpp +++ b/core/pim/today/todaybase.cpp | |||
@@ -27,7 +27,8 @@ | |||
27 | #include <qwhatsthis.h> | 27 | #include <qwhatsthis.h> |
28 | #include <qimage.h> | 28 | #include <qimage.h> |
29 | #include <qpixmap.h> | 29 | #include <qpixmap.h> |
30 | //#include <qscrollview.h> | 30 | #include <qscrollview.h> |
31 | #include <qvbox.h> | ||
31 | 32 | ||
32 | #include <qpe/resource.h> | 33 | #include <qpe/resource.h> |
33 | 34 | ||
@@ -64,8 +65,8 @@ this->setPalette(pal); | |||
64 | 65 | ||
65 | QVBoxLayout * layout = new QVBoxLayout(this); | 66 | QVBoxLayout * layout = new QVBoxLayout(this); |
66 | 67 | ||
67 | |||
68 | Frame4 = new QFrame( this, "Frame4" ); | 68 | Frame4 = new QFrame( this, "Frame4" ); |
69 | Frame4->setPalette( pal ); | ||
69 | Frame4->setFrameShape( QScrollView::StyledPanel ); | 70 | Frame4->setFrameShape( QScrollView::StyledPanel ); |
70 | Frame4->setFrameShadow( QScrollView::Sunken ); | 71 | Frame4->setFrameShadow( QScrollView::Sunken ); |
71 | Frame4->setBackgroundOrigin( QScrollView::ParentOrigin ); | 72 | Frame4->setBackgroundOrigin( QScrollView::ParentOrigin ); |
@@ -102,7 +103,7 @@ this->setPalette(pal); | |||
102 | TextLabel1_font.setBold( TRUE ); | 103 | TextLabel1_font.setBold( TRUE ); |
103 | TextLabel1->setFont( TextLabel1_font ); | 104 | TextLabel1->setFont( TextLabel1_font ); |
104 | TextLabel1->setBackgroundOrigin( QLabel::ParentOrigin ); | 105 | TextLabel1->setBackgroundOrigin( QLabel::ParentOrigin ); |
105 | TextLabel1->setTextFormat( QLabel::AutoText ); | 106 | TextLabel1->setTextFormat( RichText ); |
106 | 107 | ||
107 | // todo | 108 | // todo |
108 | Frame15 = new QFrame( this, "Frame15" ); | 109 | Frame15 = new QFrame( this, "Frame15" ); |
@@ -111,9 +112,7 @@ this->setPalette(pal); | |||
111 | 112 | ||
112 | TodoButton = new QPushButton (Frame15, "TodoButton" ); | 113 | TodoButton = new QPushButton (Frame15, "TodoButton" ); |
113 | TodoButton->setGeometry( QRect( 2, 4, 36, 32 ) ); | 114 | TodoButton->setGeometry( QRect( 2, 4, 36, 32 ) ); |
114 | //TodoButton->setBackgroundMode(NoBackground); | ||
115 | TodoButton->setPalette( pal ); | 115 | TodoButton->setPalette( pal ); |
116 | //TodoButton->setBackgroundOrigin( QPushButton::WidgetOrigin ); | ||
117 | TodoButton->setPixmap( todo ); | 116 | TodoButton->setPixmap( todo ); |
118 | TodoButton->setFlat( TRUE ); | 117 | TodoButton->setFlat( TRUE ); |
119 | 118 | ||
@@ -125,7 +124,6 @@ this->setPalette(pal); | |||
125 | 124 | ||
126 | PushButton1 = new QPushButton (Frame15, "PushButton1" ); | 125 | PushButton1 = new QPushButton (Frame15, "PushButton1" ); |
127 | PushButton1->setGeometry( QRect( 216, 68, 25, 21 ) ); | 126 | PushButton1->setGeometry( QRect( 216, 68, 25, 21 ) ); |
128 | //PushButton1->setBackgroundOrigin( QPushButton::WidgetOrigin ); | ||
129 | PushButton1->setPixmap( config ); | 127 | PushButton1->setPixmap( config ); |
130 | PushButton1->setPalette( pal ); | 128 | PushButton1->setPalette( pal ); |
131 | PushButton1->setAutoDefault( TRUE ); | 129 | PushButton1->setAutoDefault( TRUE ); |
@@ -135,34 +133,28 @@ this->setPalette(pal); | |||
135 | MailFrame = new QFrame( this ,"MailFrame" ); | 133 | MailFrame = new QFrame( this ,"MailFrame" ); |
136 | MailFrame->setFrameShape( QScrollView::StyledPanel ); | 134 | MailFrame->setFrameShape( QScrollView::StyledPanel ); |
137 | MailFrame->setFrameShadow( QScrollView::Sunken ); | 135 | MailFrame->setFrameShadow( QScrollView::Sunken ); |
138 | //MailFrame->setBackgroundOrigin( QScrollView::ParentOrigin ); | ||
139 | 136 | ||
140 | MailButton = new QPushButton (MailFrame, "MailButton" ); | 137 | MailButton = new QPushButton (MailFrame, "MailButton" ); |
141 | MailButton->setGeometry( QRect( 2, 10, 36, 19 ) ); | 138 | MailButton->setGeometry( QRect( 2, 3, 36, 19 ) ); |
142 | //MailButton->setBackgroundOrigin( QPushButton::WidgetOrigin ); | ||
143 | MailButton->setPalette( pal ); | 139 | MailButton->setPalette( pal ); |
144 | MailButton->setPixmap( mail ); | 140 | MailButton->setPixmap( mail ); |
145 | MailButton->setFlat( TRUE ); | 141 | MailButton->setFlat( TRUE ); |
146 | 142 | ||
147 | MailField = new QLabel( MailFrame, "DatesField" ); | 143 | MailField = new QLabel( MailFrame, "DatesField" ); |
148 | MailField->setGeometry( QRect( 40, 10, 203, 120 ) ); | 144 | MailField->setGeometry( QRect( 40, 4, 203, 120 ) ); |
149 | MailField->setText( tr( "Opiemail not installed" ) ); | 145 | MailField->setText( tr( "Opiemail not installed" ) ); |
150 | MailField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); | 146 | MailField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); |
151 | MailField->setMaximumHeight(15); | 147 | MailField->setMaximumHeight(40); |
152 | MailField->setMinimumHeight(10); | 148 | MailField->setMinimumHeight(30); |
153 | |||
154 | |||
155 | |||
156 | 149 | ||
157 | layout->addWidget(Frame); | 150 | layout->addWidget(Frame); |
158 | layout->addWidget(Frame4); | 151 | layout->addWidget(Frame4); |
159 | layout->addWidget(MailFrame); | 152 | layout->addWidget(MailFrame); |
160 | layout->addWidget(Frame15); | 153 | layout->addWidget(Frame15); |
161 | //layout->addWidget(split); | ||
162 | 154 | ||
163 | layout->setStretchFactor(Frame4,4); | 155 | layout->setStretchFactor(Frame4,5); |
164 | layout->setStretchFactor(MailFrame,1); | 156 | layout->setStretchFactor(MailFrame,1); |
165 | layout->setStretchFactor(Frame15,3); | 157 | layout->setStretchFactor(Frame15,4); |
166 | } | 158 | } |
167 | 159 | ||
168 | /* | 160 | /* |
@@ -170,6 +162,5 @@ this->setPalette(pal); | |||
170 | */ | 162 | */ |
171 | TodayBase::~TodayBase() | 163 | TodayBase::~TodayBase() |
172 | { | 164 | { |
173 | |||
174 | } | 165 | } |
175 | 166 | ||