summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/dateentry.ui40
-rw-r--r--core/pim/datebook/dateentryimpl.cpp38
2 files changed, 61 insertions, 17 deletions
diff --git a/core/pim/datebook/dateentry.ui b/core/pim/datebook/dateentry.ui
index dc5195f..1a712ec 100644
--- a/core/pim/datebook/dateentry.ui
+++ b/core/pim/datebook/dateentry.ui
@@ -40,13 +40,13 @@
40 <name>caption</name> 40 <name>caption</name>
41 <string>New Event</string> 41 <string>New Event</string>
42 </property> 42 </property>
43 <grid> 43 <grid>
44 <property stdset="1"> 44 <property stdset="1">
45 <name>margin</name> 45 <name>margin</name>
46 <number>0</number> 46 <number>2</number>
47 </property> 47 </property>
48 <property stdset="1"> 48 <property stdset="1">
49 <name>spacing</name> 49 <name>spacing</name>
50 <number>0</number> 50 <number>0</number>
51 </property> 51 </property>
52 <widget row="1" column="0" > 52 <widget row="1" column="0" >
@@ -144,13 +144,13 @@
144 <property stdset="1"> 144 <property stdset="1">
145 <name>name</name> 145 <name>name</name>
146 <cstring>TextLabel1</cstring> 146 <cstring>TextLabel1</cstring>
147 </property> 147 </property>
148 <property stdset="1"> 148 <property stdset="1">
149 <name>text</name> 149 <name>text</name>
150 <string>Description</string> 150 <string>Description </string>
151 </property> 151 </property>
152 </widget> 152 </widget>
153 <widget row="1" column="1" rowspan="1" colspan="3" > 153 <widget row="1" column="1" rowspan="1" colspan="3" >
154 <class>QComboBox</class> 154 <class>QComboBox</class>
155 <item> 155 <item>
156 <property> 156 <property>
@@ -206,13 +206,13 @@
206 <property stdset="1"> 206 <property stdset="1">
207 <name>name</name> 207 <name>name</name>
208 <cstring>TextLabel3</cstring> 208 <cstring>TextLabel3</cstring>
209 </property> 209 </property>
210 <property stdset="1"> 210 <property stdset="1">
211 <name>text</name> 211 <name>text</name>
212 <string>Start - End</string> 212 <string>Start - End </string>
213 </property> 213 </property>
214 </widget> 214 </widget>
215 <widget row="3" column="1" > 215 <widget row="3" column="1" >
216 <class>QPushButton</class> 216 <class>QPushButton</class>
217 <property stdset="1"> 217 <property stdset="1">
218 <name>name</name> 218 <name>name</name>
@@ -262,20 +262,42 @@
262 <set>AlignHCenter</set> 262 <set>AlignHCenter</set>
263 </property> 263 </property>
264 <property> 264 <property>
265 <name>hAlign</name> 265 <name>hAlign</name>
266 </property> 266 </property>
267 </widget> 267 </widget>
268 <spacer row="3" column="2" rowspan="2" colspan="1" >
269 <property>
270 <name>name</name>
271 <cstring>Spacer1_2</cstring>
272 </property>
273 <property stdset="1">
274 <name>orientation</name>
275 <enum>Horizontal</enum>
276 </property>
277 <property stdset="1">
278 <name>sizeType</name>
279 <enum>Expanding</enum>
280 </property>
281 <property>
282 <name>sizeHint</name>
283 <size>
284 <width>20</width>
285 <height>20</height>
286 </size>
287 </property>
288 </spacer>
289
268 <widget row="5" column="1" colspan="3"> 290 <widget row="5" column="1" colspan="3">
269 <class>TimePicker</class> 291 <class>TimePicker</class>
270 <property stdset="1"> 292 <property stdset="1">
271 <name>name</name> 293 <name>name</name>
272 <cstring>timePickerStart</cstring> 294 <cstring>timePickerStart</cstring>
273 </property> 295 </property>
274 </widget> 296 </widget>
275 <widget row="3" column="2" colspan="2"> 297 <widget row="3" column="3" colspan="1">
276 <class>QPushButton</class> 298 <class>QPushButton</class>
277 <property stdset="1"> 299 <property stdset="1">
278 <name>name</name> 300 <name>name</name>
279 <cstring>buttonEnd</cstring> 301 <cstring>buttonEnd</cstring>
280 </property> 302 </property>
281 <property stdset="1"> 303 <property stdset="1">
@@ -294,13 +316,13 @@
294 <size> 316 <size>
295 <width>70</width> 317 <width>70</width>
296 <height>32767</height> 318 <height>32767</height>
297 </size> 319 </size>
298 </property> 320 </property>
299 </widget> 321 </widget>
300 <widget row="4" column="2" colspan="2"> 322 <widget row="4" column="3" colspan="1">
301 <class>QLineEdit</class> 323 <class>QLineEdit</class>
302 <property stdset="1"> 324 <property stdset="1">
303 <name>name</name> 325 <name>name</name>
304 <cstring>comboEnd</cstring> 326 <cstring>comboEnd</cstring>
305 </property> 327 </property>
306 <property stdset="1"> 328 <property stdset="1">
@@ -326,13 +348,13 @@
326 </property> 348 </property>
327 </widget> 349 </widget>
328 <widget row="5" column="0" > 350 <widget row="5" column="0" >
329 <class>QLabel</class> 351 <class>QLabel</class>
330 <property stdset="1"> 352 <property stdset="1">
331 <name>name</name> 353 <name>name</name>
332 <cstring>TextLabel3_2</cstring> 354 <cstring>TimePickerLabel</cstring>
333 </property> 355 </property>
334 <property stdset="1"> 356 <property stdset="1">
335 <name>text</name> 357 <name>text</name>
336 <string>Start time</string> 358 <string>Start time</string>
337 </property> 359 </property>
338 </widget> 360 </widget>
@@ -560,12 +582,18 @@
560 <sender>checkAllDay</sender> 582 <sender>checkAllDay</sender>
561 <signal>toggled(bool)</signal> 583 <signal>toggled(bool)</signal>
562 <receiver>comboEnd</receiver> 584 <receiver>comboEnd</receiver>
563 <slot>setDisabled(bool)</slot> 585 <slot>setDisabled(bool)</slot>
564 </connection> 586 </connection>
565 <connection> 587 <connection>
588 <sender>checkAllDay</sender>
589 <signal>toggled(bool)</signal>
590 <receiver>timePickerStart</receiver>
591 <slot>setDisabled(bool)</slot>
592 </connection>
593 <connection>
566 <sender>checkAlarm</sender> 594 <sender>checkAlarm</sender>
567 <signal>toggled(bool)</signal> 595 <signal>toggled(bool)</signal>
568 <receiver>comboSound</receiver> 596 <receiver>comboSound</receiver>
569 <slot>setEnabled(bool)</slot> 597 <slot>setEnabled(bool)</slot>
570 </connection> 598 </connection>
571 <connection> 599 <connection>
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp
index f2f17c6..e14e2f5 100644
--- a/core/pim/datebook/dateentryimpl.cpp
+++ b/core/pim/datebook/dateentryimpl.cpp
@@ -65,19 +65,35 @@ DateEntry::DateEntry( bool startOnMonday, const QDateTime &start,
65} 65}
66 66
67bool DateEntry::eventFilter(QObject *obj, QEvent *ev ) 67bool DateEntry::eventFilter(QObject *obj, QEvent *ev )
68{ 68{
69 if( ev->type() == QEvent::FocusIn ){ 69 if( ev->type() == QEvent::FocusIn ){
70 if( obj == comboStart ){ 70 if( obj == comboStart ){
71 TextLabel3_2->setText( tr("Start Time" ) ); 71 timePickerStart->setHour(startTime.hour());
72 timePickerStart->setMinute(startTime.minute());
73 TimePickerLabel->setText( tr("Start Time" ) );
72 m_showStart= true; 74 m_showStart= true;
73 }else if( obj == comboEnd ){ 75 }else if( obj == comboEnd ){
74 TextLabel3_2->setText( tr("End Time") ); 76 timePickerStart->setHour(endTime.hour());
77 timePickerStart->setMinute(endTime.minute());
78 TimePickerLabel->setText( tr("End Time") );
75 m_showStart = false; 79 m_showStart = false;
76 } 80 }
81 } else if( ev->type() == QEvent::FocusOut ){
82 if( obj == comboEnd ){
83 QString s;
84 s.sprintf("%.2d:%.2d",endTime.hour(), endTime.minute());
85 comboEnd->setText(s);
86 }
87 else if( obj == comboStart ){
88 QString s;
89 s.sprintf("%.2d:%.2d",startTime.hour(), startTime.minute());
90 comboStart->setText(s);
91 }
77 } 92 }
93
78 return false; 94 return false;
79} 95}
80 96
81static void addOrPick( QComboBox* combo, const QString& t ) 97static void addOrPick( QComboBox* combo, const QString& t )
82{ 98{
83 // Pick an item if one excists 99 // Pick an item if one excists
@@ -265,23 +281,24 @@ static QTime parseTime( const QString& s, bool ampm )
265 281
266/* 282/*
267 * public slot 283 * public slot
268 */ 284 */
269void DateEntry::endTimeChanged( const QString &s ) 285void DateEntry::endTimeChanged( const QString &s )
270{ 286{
271 QTime tmpTime = parseTime(s,ampm); 287 endTimeChanged( parseTime(s,ampm) );
272 if ( endDate > startDate || tmpTime >= startTime ) { 288}
273 endTime = tmpTime; 289
290void DateEntry::endTimeChanged( const QTime &t ) {
291 if ( endDate > startDate || t >= startTime ) {
292 endTime = t;
274 } else { 293 } else {
275 endTime = startTime; 294 endTime = startTime;
276 //comboEnd->setCurrentItem( comboStart->currentItem() ); 295 //comboEnd->setCurrentItem( comboStart->currentItem() );
277 } 296 }
278 297 timePickerStart->setHour(endTime.hour());
279} 298 timePickerStart->setMinute(endTime.minute());
280
281void DateEntry::endTimeChanged( const QTime &t ) {
282} 299}
283 300
284/* 301/*
285 * public slot 302 * public slot
286 */ 303 */
287void DateEntry::startDateChanged( int y, int m, int d ) 304void DateEntry::startDateChanged( int y, int m, int d )
@@ -323,15 +340,14 @@ void DateEntry::startTimeChanged( const QTime &t )
323} 340}
324void DateEntry::startTimePicked( const QTime &t ) { 341void DateEntry::startTimePicked( const QTime &t ) {
325 if(m_showStart ){ 342 if(m_showStart ){
326 startTimeChanged(t); 343 startTimeChanged(t);
327 updateTimeEdit(true,true); 344 updateTimeEdit(true,true);
328 }else{ 345 }else{
329 endTime = t; 346 endTimeChanged(t);
330 updateTimeEdit(false, true ); 347 updateTimeEdit(false, true );
331
332 } 348 }
333} 349}
334 350
335/* 351/*
336 * public slot 352 * public slot
337 */ 353 */