author | zecke <zecke> | 2002-06-27 12:46:06 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-06-27 12:46:06 (UTC) |
commit | 88b644d1c106008fc15f6a3c496e40296e9029d4 (patch) (unidiff) | |
tree | 73a1575085426283df714f374862a1d1a7ac42d1 | |
parent | 475c11d442a03d8e53b220923626c4bb7350831f (diff) | |
download | opie-88b644d1c106008fc15f6a3c496e40296e9029d4.zip opie-88b644d1c106008fc15f6a3c496e40296e9029d4.tar.gz opie-88b644d1c106008fc15f6a3c496e40296e9029d4.tar.bz2 |
Fix for #82
setMargin(2);
-rw-r--r-- | core/pim/todo/todoentryimpl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/pim/todo/todoentryimpl.cpp b/core/pim/todo/todoentryimpl.cpp index 89f08e0..af47665 100644 --- a/core/pim/todo/todoentryimpl.cpp +++ b/core/pim/todo/todoentryimpl.cpp | |||
@@ -47,97 +47,97 @@ | |||
47 | 47 | ||
48 | 48 | ||
49 | NewTaskDialog::NewTaskDialog( const ToDoEvent& task, QWidget *parent, | 49 | NewTaskDialog::NewTaskDialog( const ToDoEvent& task, QWidget *parent, |
50 | const char *name, bool modal, WFlags fl ) | 50 | const char *name, bool modal, WFlags fl ) |
51 | : NewTaskDialogBase( parent, name, modal, fl ), | 51 | : NewTaskDialogBase( parent, name, modal, fl ), |
52 | todo( task ) | 52 | todo( task ) |
53 | { | 53 | { |
54 | todo.setCategories( task.allCategories() ); | 54 | todo.setCategories( task.allCategories() ); |
55 | if ( todo.hasDate() ) | 55 | if ( todo.hasDate() ) |
56 | date = todo.date(); | 56 | date = todo.date(); |
57 | else | 57 | else |
58 | date = QDate::currentDate(); | 58 | date = QDate::currentDate(); |
59 | 59 | ||
60 | init(); | 60 | init(); |
61 | comboPriority->setCurrentItem( task.priority() - 1 ); | 61 | comboPriority->setCurrentItem( task.priority() - 1 ); |
62 | 62 | ||
63 | checkCompleted->setChecked( task.isCompleted() ); | 63 | checkCompleted->setChecked( task.isCompleted() ); |
64 | checkDate->setChecked( task.hasDate() ); | 64 | checkDate->setChecked( task.hasDate() ); |
65 | buttonDate->setText( TimeString::longDateString( date ) ); | 65 | buttonDate->setText( TimeString::longDateString( date ) ); |
66 | 66 | ||
67 | txtTodo->setText( task.description() ); | 67 | txtTodo->setText( task.description() ); |
68 | lneSum->setText( task.summary() ); | 68 | lneSum->setText( task.summary() ); |
69 | cmbProg->setCurrentItem( task.progress()/20 ); | 69 | cmbProg->setCurrentItem( task.progress()/20 ); |
70 | } | 70 | } |
71 | 71 | ||
72 | /* | 72 | /* |
73 | * Constructs a NewTaskDialog which is a child of 'parent', with the | 73 | * Constructs a NewTaskDialog which is a child of 'parent', with the |
74 | * name 'name' and widget flags set to 'f' | 74 | * name 'name' and widget flags set to 'f' |
75 | * | 75 | * |
76 | * The dialog will by default be modeless, unless you set 'modal' to | 76 | * The dialog will by default be modeless, unless you set 'modal' to |
77 | * TRUE to construct a modal dialog. | 77 | * TRUE to construct a modal dialog. |
78 | */ | 78 | */ |
79 | NewTaskDialog::NewTaskDialog( int id, QWidget* parent, const char* name, bool modal, | 79 | NewTaskDialog::NewTaskDialog( int id, QWidget* parent, const char* name, bool modal, |
80 | WFlags fl ) | 80 | WFlags fl ) |
81 | : NewTaskDialogBase( parent, name, modal, fl ), | 81 | : NewTaskDialogBase( parent, name, modal, fl ), |
82 | date( QDate::currentDate() ) | 82 | date( QDate::currentDate() ) |
83 | { | 83 | { |
84 | if ( id != -1 ) { | 84 | if ( id != -1 ) { |
85 | QArray<int> ids( 1 ); | 85 | QArray<int> ids( 1 ); |
86 | ids[0] = id; | 86 | ids[0] = id; |
87 | todo.setCategory( Qtopia::Record::idsToString( ids ) ); | 87 | todo.setCategory( Qtopia::Record::idsToString( ids ) ); |
88 | } | 88 | } |
89 | init(); | 89 | init(); |
90 | } | 90 | } |
91 | 91 | ||
92 | void NewTaskDialog::init() | 92 | void NewTaskDialog::init() |
93 | { | 93 | { |
94 | if( layout() != 0 ){ | 94 | if( layout() != 0 ){ |
95 | layout()->setMargin( 0 ); | 95 | layout()->setMargin( 2 ); |
96 | } | 96 | } |
97 | QPopupMenu *m1 = new QPopupMenu( this ); | 97 | QPopupMenu *m1 = new QPopupMenu( this ); |
98 | picker = new DateBookMonth( m1, 0, TRUE ); | 98 | picker = new DateBookMonth( m1, 0, TRUE ); |
99 | m1->insertItem( picker ); | 99 | m1->insertItem( picker ); |
100 | buttonDate->setPopup( m1 ); | 100 | buttonDate->setPopup( m1 ); |
101 | comboCategory->setCategories( todo.categories(), "Todo List", tr("Todo List") ); | 101 | comboCategory->setCategories( todo.categories(), "Todo List", tr("Todo List") ); |
102 | 102 | ||
103 | connect( picker, SIGNAL( dateClicked( int, int, int ) ), | 103 | connect( picker, SIGNAL( dateClicked( int, int, int ) ), |
104 | this, SLOT( dateChanged( int, int, int ) ) ); | 104 | this, SLOT( dateChanged( int, int, int ) ) ); |
105 | 105 | ||
106 | buttonDate->setText( TimeString::longDateString( date ) ); | 106 | buttonDate->setText( TimeString::longDateString( date ) ); |
107 | picker->setDate( date.year(), date.month(), date.day() ); | 107 | picker->setDate( date.year(), date.month(), date.day() ); |
108 | lblDown->setPixmap(Resource::loadPixmap("down") ); | 108 | lblDown->setPixmap(Resource::loadPixmap("down") ); |
109 | } | 109 | } |
110 | 110 | ||
111 | /* | 111 | /* |
112 | * Destroys the object and frees any allocated resources | 112 | * Destroys the object and frees any allocated resources |
113 | */ | 113 | */ |
114 | NewTaskDialog::~NewTaskDialog() | 114 | NewTaskDialog::~NewTaskDialog() |
115 | { | 115 | { |
116 | // no need to delete child widgets, Qt does it all for us | 116 | // no need to delete child widgets, Qt does it all for us |
117 | } | 117 | } |
118 | void NewTaskDialog::dateChanged( int y, int m, int d ) | 118 | void NewTaskDialog::dateChanged( int y, int m, int d ) |
119 | { | 119 | { |
120 | date = QDate( y, m, d ); | 120 | date = QDate( y, m, d ); |
121 | buttonDate->setText( TimeString::longDateString( date ) ); | 121 | buttonDate->setText( TimeString::longDateString( date ) ); |
122 | } | 122 | } |
123 | 123 | ||
124 | /*! | 124 | /*! |
125 | */ | 125 | */ |
126 | 126 | ||
127 | ToDoEvent NewTaskDialog::todoEntry() | 127 | ToDoEvent NewTaskDialog::todoEntry() |
128 | { | 128 | { |
129 | if( checkDate->isChecked() ){ | 129 | if( checkDate->isChecked() ){ |
130 | todo.setDate( date ); | 130 | todo.setDate( date ); |
131 | todo.setHasDate( true ); | 131 | todo.setHasDate( true ); |
132 | }else{ | 132 | }else{ |
133 | todo.setHasDate( false ); | 133 | todo.setHasDate( false ); |
134 | } | 134 | } |
135 | if ( comboCategory->currentCategory() != -1 ) { | 135 | if ( comboCategory->currentCategory() != -1 ) { |
136 | QArray<int> arr = comboCategory->currentCategories(); | 136 | QArray<int> arr = comboCategory->currentCategories(); |
137 | QStringList list; | 137 | QStringList list; |
138 | list = QStringList::split(";", Qtopia::Record::idsToString( arr )) ; | 138 | list = QStringList::split(";", Qtopia::Record::idsToString( arr )) ; |
139 | todo.setCategories( list ); | 139 | todo.setCategories( list ); |
140 | } | 140 | } |
141 | todo.setPriority( comboPriority->currentItem() + 1 ); | 141 | todo.setPriority( comboPriority->currentItem() + 1 ); |
142 | todo.setCompleted( checkCompleted->isChecked() ); | 142 | todo.setCompleted( checkCompleted->isChecked() ); |
143 | 143 | ||