author | drw <drw> | 2002-12-23 17:13:12 (UTC) |
---|---|---|
committer | drw <drw> | 2002-12-23 17:13:12 (UTC) |
commit | 1cb75c721b69459494cb599730a96bbc1ddc0f65 (patch) (unidiff) | |
tree | 9a45955d74016b639593c4a888acb4e96e17e9fb /core/pim/todo/otaskeditor.cpp | |
parent | deb4685b99d6c5917f92ce188ead09fdd9c37859 (diff) | |
download | opie-1cb75c721b69459494cb599730a96bbc1ddc0f65.zip opie-1cb75c721b69459494cb599730a96bbc1ddc0f65.tar.gz opie-1cb75c721b69459494cb599730a96bbc1ddc0f65.tar.bz2 |
Task Editor dialog: 1. added tab icons 2. rearranged the overview tab 3. alarm/reminder tab updates 4. code clean-up. Still need to work on advanced tab and add qwhatsthis.
-rw-r--r-- | core/pim/todo/otaskeditor.cpp | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/core/pim/todo/otaskeditor.cpp b/core/pim/todo/otaskeditor.cpp index eeb3c0c..e6ebf60 100644 --- a/core/pim/todo/otaskeditor.cpp +++ b/core/pim/todo/otaskeditor.cpp | |||
@@ -4,3 +4,2 @@ | |||
4 | #include <qmultilineedit.h> | 4 | #include <qmultilineedit.h> |
5 | #include <qscrollview.h> | ||
6 | 5 | ||
@@ -8,3 +7,3 @@ | |||
8 | 7 | ||
9 | #include "taskeditoroverviewimpl.h" | 8 | #include "taskeditoroverview.h" |
10 | #include "taskeditoradvancedimpl.h" | 9 | #include "taskeditoradvancedimpl.h" |
@@ -43,3 +42,3 @@ OTodo OTaskEditor::todo()const{ | |||
43 | m_overView->save( to ); | 42 | m_overView->save( to ); |
44 | m_adv->save( to ); | 43 | //m_adv->save( to ); |
45 | to.setRecurrence( m_rec->recurrence() ); | 44 | to.setRecurrence( m_rec->recurrence() ); |
@@ -50,3 +49,3 @@ void OTaskEditor::load(const OTodo& to) { | |||
50 | m_overView->load( to ); | 49 | m_overView->load( to ); |
51 | m_adv->load( to ); | 50 | //m_adv->load( to ); |
52 | m_rec->setRecurrence( to.recurrence(), to.hasDueDate() ? to.dueDate() : QDate::currentDate() ); | 51 | m_rec->setRecurrence( to.recurrence(), to.hasDueDate() ? to.dueDate() : QDate::currentDate() ); |
@@ -54,14 +53,8 @@ void OTaskEditor::load(const OTodo& to) { | |||
54 | void OTaskEditor::init() { | 53 | void OTaskEditor::init() { |
55 | QVBoxLayout* lay = new QVBoxLayout(this ); | ||
56 | QScrollView* view = new QScrollView( this ); | ||
57 | view->setResizePolicy( QScrollView::AutoOneFit ); | ||
58 | lay->addWidget( view ); | ||
59 | |||
60 | setCaption("Task Editor"); | 54 | setCaption("Task Editor"); |
61 | QWidget* container = new QWidget( view->viewport() ); | ||
62 | view->addChild( container ); | ||
63 | 55 | ||
64 | QVBoxLayout* layo = new QVBoxLayout( container ); | 56 | QVBoxLayout* layo = new QVBoxLayout( this ); |
65 | m_tab = new OTabWidget(container ); | 57 | m_tab = new OTabWidget( this ); |
66 | layo->addWidget( m_tab ); | 58 | layo->addWidget( m_tab ); |
59 | |||
67 | /* | 60 | /* |
@@ -69,13 +62,13 @@ void OTaskEditor::init() { | |||
69 | */ | 62 | */ |
70 | m_overView = new TaskEditorOverViewImpl(m_tab ); | 63 | m_overView = new TaskEditorOverView( m_tab ); |
71 | m_tab->addTab( m_overView, QString::null, tr("Overview") ); | 64 | m_tab->addTab( m_overView, "TodoList", tr("Overview") ); |
72 | 65 | ||
73 | m_adv = new TaskEditorAdvancedImpl( m_tab ); | 66 | m_adv = new TaskEditorAdvancedImpl( m_tab ); |
74 | m_tab->addTab( m_adv, QString::null, tr("Advanced") ); | 67 | m_tab->addTab( m_adv, "todo/advanced", tr("Advanced") ); |
75 | 68 | ||
76 | m_alarm = new TaskEditorAlarms( m_tab ); | 69 | m_alarm = new TaskEditorAlarms( m_tab ); |
77 | m_tab->addTab( m_alarm, QString::null, tr("Alarms") ); | 70 | m_tab->addTab( m_alarm, "todo/alarm", tr("Alarms") ); |
78 | 71 | ||
79 | m_remind = new TaskEditorAlarms( m_tab ); | 72 | m_remind = new TaskEditorAlarms( m_tab ); |
80 | m_tab->addTab( m_remind, QString::null, tr("Reminders") ); | 73 | m_tab->addTab( m_remind, "todo/reminder", tr("Reminders") ); |
81 | 74 | ||
@@ -83,6 +76,6 @@ void OTaskEditor::init() { | |||
83 | lbl->setText( tr("X-Ref") ); | 76 | lbl->setText( tr("X-Ref") ); |
84 | m_tab->addTab( lbl, QString::null, tr("X-Ref") ); | 77 | m_tab->addTab( lbl, "todo/xref", tr("X-Ref") ); |
85 | 78 | ||
86 | m_rec = new ORecurranceWidget( true, QDate::currentDate(), this ); | 79 | m_rec = new ORecurranceWidget( true, QDate::currentDate(), this ); |
87 | m_tab->addTab( m_rec, QString::null, tr("Recurrance") ); | 80 | m_tab->addTab( m_rec, "repeat", tr("Recurrance") ); |
88 | 81 | ||