summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/todo/mainwindow.cpp2
-rw-r--r--core/pim/todo/todoentry.ui196
-rw-r--r--core/pim/todo/todoentryimpl.cpp3
-rw-r--r--core/pim/todo/todotable.cpp9
-rw-r--r--core/pim/todo/todotable.h3
-rw-r--r--libopie/tododb.cpp4
-rw-r--r--libopie/todoevent.cpp35
-rw-r--r--libopie/todoevent.h59
-rw-r--r--libopie/todovcalresource.cpp7
9 files changed, 243 insertions, 75 deletions
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index b7b1da0..1358f1c 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -596,3 +596,3 @@ void TodoWindow::slotBeam()
596 connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) ); 596 connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
597 QString description = c.description(); 597 QString description = c.summary();
598 ir->send( beamfile, description, "text/x-vCalendar" ); 598 ir->send( beamfile, description, "text/x-vCalendar" );
diff --git a/core/pim/todo/todoentry.ui b/core/pim/todo/todoentry.ui
index c735e76..87ee68c 100644
--- a/core/pim/todo/todoentry.ui
+++ b/core/pim/todo/todoentry.ui
@@ -32,3 +32,3 @@
32 <y>0</y> 32 <y>0</y>
33 <width>249</width> 33 <width>245</width>
34 <height>321</height> 34 <height>321</height>
@@ -46,11 +46,2 @@
46 </property> 46 </property>
47 <vbox>
48 <property stdset="1">
49 <name>margin</name>
50 <number>0</number>
51 </property>
52 <property stdset="1">
53 <name>spacing</name>
54 <number>0</number>
55 </property>
56 <widget> 47 <widget>
@@ -59,3 +50,12 @@
59 <name>name</name> 50 <name>name</name>
60 <cstring>Layout4</cstring> 51 <cstring>Layout3</cstring>
52 </property>
53 <property stdset="1">
54 <name>geometry</name>
55 <rect>
56 <x>1</x>
57 <y>25</y>
58 <width>243</width>
59 <height>17</height>
60 </rect>
61 </property> 61 </property>
@@ -74,3 +74,7 @@
74 <name>name</name> 74 <name>name</name>
75 <cstring>TextLabel2</cstring> 75 <cstring>TextLabel3</cstring>
76 </property>
77 <property stdset="1">
78 <name>frameShape</name>
79 <enum>NoFrame</enum>
76 </property> 80 </property>
@@ -78,3 +82,3 @@
78 <name>text</name> 82 <name>text</name>
79 <string>Priority:</string> 83 <string>Category:</string>
80 </property> 84 </property>
@@ -82,52 +86,35 @@
82 <widget> 86 <widget>
83 <class>QComboBox</class> 87 <class>CategorySelect</class>
84 <item> 88 <property stdset="1">
85 <property> 89 <name>name</name>
86 <name>text</name> 90 <cstring>comboCategory</cstring>
87 <string>1 - Very High</string>
88 </property>
89 </item>
90 <item>
91 <property>
92 <name>text</name>
93 <string>2 - High</string>
94 </property>
95 </item>
96 <item>
97 <property>
98 <name>text</name>
99 <string>3 - Normal</string>
100 </property>
101 </item>
102 <item>
103 <property>
104 <name>text</name>
105 <string>4 - Low</string>
106 </property>
107 </item>
108 <item>
109 <property>
110 <name>text</name>
111 <string>5 - Very Low</string>
112 </property> 91 </property>
113 </item> 92 </widget>
93 </hbox>
94 </widget>
95 <widget>
96 <class>QLayoutWidget</class>
114 <property stdset="1"> 97 <property stdset="1">
115 <name>name</name> 98 <name>name</name>
116 <cstring>comboPriority</cstring> 99 <cstring>Layout6</cstring>
117 </property> 100 </property>
118 <property stdset="1"> 101 <property stdset="1">
119 <name>sizePolicy</name> 102 <name>geometry</name>
120 <sizepolicy> 103 <rect>
121 <hsizetype>7</hsizetype> 104 <x>0</x>
122 <vsizetype>0</vsizetype> 105 <y>0</y>
123 </sizepolicy> 106 <width>240</width>
107 <height>320</height>
108 </rect>
124 </property> 109 </property>
110 <grid>
125 <property stdset="1"> 111 <property stdset="1">
126 <name>currentItem</name> 112 <name>margin</name>
127 <number>2</number> 113 <number>0</number>
128 </property> 114 </property>
129 </widget> 115 <property stdset="1">
130 </hbox> 116 <name>spacing</name>
131 </widget> 117 <number>6</number>
132 <widget> 118 </property>
119 <widget row="2" column="0" >
133 <class>QLayoutWidget</class> 120 <class>QLayoutWidget</class>
@@ -135,3 +122,3 @@
135 <name>name</name> 122 <name>name</name>
136 <cstring>Layout3</cstring> 123 <cstring>Layout4</cstring>
137 </property> 124 </property>
@@ -150,7 +137,3 @@
150 <name>name</name> 137 <name>name</name>
151 <cstring>TextLabel3</cstring> 138 <cstring>TextLabel1</cstring>
152 </property>
153 <property stdset="1">
154 <name>frameShape</name>
155 <enum>NoFrame</enum>
156 </property> 139 </property>
@@ -158,3 +141,3 @@
158 <name>text</name> 141 <name>text</name>
159 <string>Category:</string> 142 <string>Summary:</string>
160 </property> 143 </property>
@@ -162,6 +145,6 @@
162 <widget> 145 <widget>
163 <class>CategorySelect</class> 146 <class>QLineEdit</class>
164 <property stdset="1"> 147 <property stdset="1">
165 <name>name</name> 148 <name>name</name>
166 <cstring>comboCategory</cstring> 149 <cstring>lneSum</cstring>
167 </property> 150 </property>
@@ -170,3 +153,10 @@
170 </widget> 153 </widget>
171 <widget> 154 <widget row="3" column="0" >
155 <class>QMultiLineEdit</class>
156 <property stdset="1">
157 <name>name</name>
158 <cstring>txtTodo</cstring>
159 </property>
160 </widget>
161 <widget row="1" column="0" >
172 <class>QLayoutWidget</class> 162 <class>QLayoutWidget</class>
@@ -224,10 +214,80 @@
224 </widget> 214 </widget>
215 <widget row="0" column="0" >
216 <class>QLayoutWidget</class>
217 <property stdset="1">
218 <name>name</name>
219 <cstring>Layout4</cstring>
220 </property>
221 <hbox>
222 <property stdset="1">
223 <name>margin</name>
224 <number>0</number>
225 </property>
226 <property stdset="1">
227 <name>spacing</name>
228 <number>6</number>
229 </property>
225 <widget> 230 <widget>
226 <class>QMultiLineEdit</class> 231 <class>QLabel</class>
227 <property stdset="1"> 232 <property stdset="1">
228 <name>name</name> 233 <name>name</name>
229 <cstring>txtTodo</cstring> 234 <cstring>TextLabel2</cstring>
235 </property>
236 <property stdset="1">
237 <name>text</name>
238 <string>Priority:</string>
239 </property>
240 </widget>
241 <widget>
242 <class>QComboBox</class>
243 <item>
244 <property>
245 <name>text</name>
246 <string>1 - Very High</string>
230 </property> 247 </property>
248 </item>
249 <item>
250 <property>
251 <name>text</name>
252 <string>2 - High</string>
253 </property>
254 </item>
255 <item>
256 <property>
257 <name>text</name>
258 <string>3 - Normal</string>
259 </property>
260 </item>
261 <item>
262 <property>
263 <name>text</name>
264 <string>4 - Low</string>
265 </property>
266 </item>
267 <item>
268 <property>
269 <name>text</name>
270 <string>5 - Very Low</string>
271 </property>
272 </item>
273 <property stdset="1">
274 <name>name</name>
275 <cstring>comboPriority</cstring>
276 </property>
277 <property stdset="1">
278 <name>sizePolicy</name>
279 <sizepolicy>
280 <hsizetype>7</hsizetype>
281 <vsizetype>0</vsizetype>
282 </sizepolicy>
283 </property>
284 <property stdset="1">
285 <name>currentItem</name>
286 <number>2</number>
287 </property>
288 </widget>
289 </hbox>
290 </widget>
291 </grid>
231 </widget> 292 </widget>
232 </vbox>
233</widget> 293</widget>
diff --git a/core/pim/todo/todoentryimpl.cpp b/core/pim/todo/todoentryimpl.cpp
index 26a685c..dfaf9b4 100644
--- a/core/pim/todo/todoentryimpl.cpp
+++ b/core/pim/todo/todoentryimpl.cpp
@@ -2,2 +2,3 @@
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** Copyright (C) 2002 zecke
3** 4**
@@ -63,2 +64,3 @@ NewTaskDialog::NewTaskDialog( const ToDoEvent& task, QWidget *parent,
63 txtTodo->setText( task.description() ); 64 txtTodo->setText( task.description() );
65 lneSum->setText( task.summary() );
64} 66}
@@ -134,2 +136,3 @@ ToDoEvent NewTaskDialog::todoEntry()
134 todo.setDescription( txtTodo->text() ); 136 todo.setDescription( txtTodo->text() );
137 todo.setSummary( lneSum->text() );
135 138
diff --git a/core/pim/todo/todotable.cpp b/core/pim/todo/todotable.cpp
index 52a3087..779b28c 100644
--- a/core/pim/todo/todotable.cpp
+++ b/core/pim/todo/todotable.cpp
@@ -574,2 +574,3 @@ void TodoTable::updateJournal( const ToDoEvent &todo, journal_action action )
574 buf += " Description=\"" + todo.description() + "\""; 574 buf += " Description=\"" + todo.description() + "\"";
575 buf += " Summary=\"" + todo.summary() + "\"";
575 if(todo.hasDate() ) { 576 if(todo.hasDate() ) {
@@ -612,4 +613,7 @@ void TodoTable::journalFreeReplaceEntry( const ToDoEvent &todo, int row )
612{ 613{
613 QString strTodo; 614 QString strTodo = todo.summary();
615 if( strTodo.isEmpty() ){
614 strTodo = todo.description().left(40).simplifyWhiteSpace(); 616 strTodo = todo.description().left(40).simplifyWhiteSpace();
617 //todo.setSummary(strTodo );
618 }
615 if ( row == -1 ) { 619 if ( row == -1 ) {
@@ -910,2 +914,5 @@ static ToDoEvent xmlToEvent( XMLElement *element )
910 event.setDescription( dummy ); 914 event.setDescription( dummy );
915 // summary
916 dummy = element->attribute("Summary" );
917 event.setSummary( dummy );
911 // category 918 // category
diff --git a/core/pim/todo/todotable.h b/core/pim/todo/todotable.h
index 7672f21..39e00d1 100644
--- a/core/pim/todo/todotable.h
+++ b/core/pim/todo/todotable.h
@@ -201,3 +201,4 @@ inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row )
201 cmb->setText( QString::number( todo->priority() ) ); 201 cmb->setText( QString::number( todo->priority() ) );
202 QTableItem *ti = new TodoTextItem( this, todo->description().left(40).simplifyWhiteSpace() ); 202 QString sum = todo->summary();
203 QTableItem *ti = new TodoTextItem( this, sum.isEmpty() ? todo->description().left(40).simplifyWhiteSpace() : sum );
203 ti->setReplaceable( false ); 204 ti->setReplaceable( false );
diff --git a/libopie/tododb.cpp b/libopie/tododb.cpp
index fe8b8bf..6b10ec2 100644
--- a/libopie/tododb.cpp
+++ b/libopie/tododb.cpp
@@ -15,2 +15,3 @@ public:
15 FileToDoResource() {}; 15 FileToDoResource() {};
16 // FIXME better parsing
16 bool save(const QString &name, const QValueList<ToDoEvent> &m_todos ){ 17 bool save(const QString &name, const QValueList<ToDoEvent> &m_todos ){
@@ -25,2 +26,3 @@ public:
25 map.insert( "Priority", QString::number( (*it).priority() ) ); 26 map.insert( "Priority", QString::number( (*it).priority() ) );
27 map.insert( "Summary", (*it).summary() );
26 QArray<int> arrat = (*it).categories(); 28 QArray<int> arrat = (*it).categories();
@@ -113,2 +115,4 @@ public:
113 event.setDescription( dummy ); 115 event.setDescription( dummy );
116 dummy = element->attribute("Summary" );
117 event.setSummary( dummy );
114 // category 118 // category
diff --git a/libopie/todoevent.cpp b/libopie/todoevent.cpp
index aa348a2..fb7073c 100644
--- a/libopie/todoevent.cpp
+++ b/libopie/todoevent.cpp
@@ -19,4 +19,7 @@ ToDoEvent::ToDoEvent(const ToDoEvent &event )
19 19
20ToDoEvent::ToDoEvent(bool completed, int priority, const QStringList &category, 20ToDoEvent::ToDoEvent(bool completed, int priority,
21 const QString &description, bool hasDate, QDate date, int uid ) 21 const QStringList &category,
22 const QString& summary,
23 const QString &description,
24 bool hasDate, QDate date, int uid )
22{ 25{
@@ -27,2 +30,3 @@ ToDoEvent::ToDoEvent(bool completed, int priority, const QStringList &category,
27 m_category = category; 30 m_category = category;
31 m_sum = summary;
28 m_desc = Qtopia::simplifyMultiLineSpace(description ); 32 m_desc = Qtopia::simplifyMultiLineSpace(description );
@@ -68,2 +72,10 @@ QStringList ToDoEvent::allCategories()const
68} 72}
73QString ToDoEvent::extra(const QString& )const
74{
75 return QString::null;
76}
77QString ToDoEvent::summary() const
78{
79 return m_sum;
80}
69void ToDoEvent::insertCategory(const QString &str ) 81void ToDoEvent::insertCategory(const QString &str )
@@ -101,2 +113,10 @@ void ToDoEvent::setDescription(const QString &desc )
101} 113}
114void ToDoEvent::setExtra( const QString&, const QString& )
115{
116
117}
118void ToDoEvent::setSummary( const QString& sum )
119{
120 m_sum = sum;
121}
102void ToDoEvent::setCategory( const QString &cat ) 122void ToDoEvent::setCategory( const QString &cat )
@@ -132,2 +152,4 @@ QString ToDoEvent::richText() const
132 if ( !description().isEmpty() ){ 152 if ( !description().isEmpty() ){
153 text += "<b>" + QObject::tr( "Summary:") + "</b><br>";
154 text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br>";
133 text += "<b>" + QObject::tr( "Description:" ) + "</b><br>"; 155 text += "<b>" + QObject::tr( "Description:" ) + "</b><br>";
@@ -217,3 +239,9 @@ bool ToDoEvent::operator==(const ToDoEvent &toDoEvent )const
217{ 239{
218 if( m_date == toDoEvent.m_date && m_isCompleted == toDoEvent.m_isCompleted && m_hasDate == toDoEvent.m_hasDate && m_priority == toDoEvent.m_priority && m_category == toDoEvent.m_category && m_desc == toDoEvent.m_desc ) 240 if( m_priority == toDoEvent.m_priority &&
241 m_isCompleted == toDoEvent.m_isCompleted &&
242 m_hasDate == toDoEvent.m_hasDate &&
243 m_date == toDoEvent.m_date &&
244 m_category == toDoEvent.m_category &&
245 m_sum == toDoEvent.m_sum &&
246 m_desc == toDoEvent.m_desc )
219 return true; 247 return true;
@@ -230,2 +258,3 @@ ToDoEvent &ToDoEvent::operator=(const ToDoEvent &item )
230 m_uid = item.m_uid; 258 m_uid = item.m_uid;
259 m_sum = item.m_sum;
231 return *this; 260 return *this;
diff --git a/libopie/todoevent.h b/libopie/todoevent.h
index 8a00f99..7454241 100644
--- a/libopie/todoevent.h
+++ b/libopie/todoevent.h
@@ -4,2 +4,3 @@
4 4
5#include <qmap.h>
5#include <qregexp.h> 6#include <qregexp.h>
@@ -17,2 +18,3 @@ class ToDoEvent {
17 @param category Which category does it belong( uid ) 18 @param category Which category does it belong( uid )
19 @param summary A small summary of the todo
18 @param description What is this ToDoEvent about 20 @param description What is this ToDoEvent about
@@ -24,2 +26,3 @@ class ToDoEvent {
24 const QStringList &category = QStringList(), 26 const QStringList &category = QStringList(),
27 const QString &summary = QString::null ,
25 const QString &description = QString::null , 28 const QString &description = QString::null ,
@@ -45,11 +48,48 @@ class ToDoEvent {
45 int priority()const ; 48 int priority()const ;
49
50 /*
51 All category numbers as QString in a List
52 **/
46 QStringList allCategories()const; 53 QStringList allCategories()const;
54
55 /*
56 * Same as above but with QArray<int>
57 */
47 QArray<int> categories() const; 58 QArray<int> categories() const;
59
60 /**
61 * The end Date
62 */
48 QDate date()const; 63 QDate date()const;
64
65 /**
66 * The description of the todo
67 */
49 QString description()const; 68 QString description()const;
50 69
70 /**
71 * A small summary of the todo
72 */
73 QString summary() const;
74
75 /**
76 * Return this todoevent in a RichText formatted QString
77 */
51 QString richText() const; 78 QString richText() const;
52 79
80 /**
81 * Returns the UID of the Todo
82 */
53 int uid()const { return m_uid;}; 83 int uid()const { return m_uid;};
84
85
86 QString extra(const QString& )const;
87 /**
88 * Set if this Todo is completed
89 */
54 void setCompleted(bool completed ); 90 void setCompleted(bool completed );
91
92 /**
93 * set if this todo got an end data
94 */
55 void setHasDate( bool hasDate ); 95 void setHasDate( bool hasDate );
@@ -60,8 +100,25 @@ class ToDoEvent {
60 void insertCategory(const QString &category ); 100 void insertCategory(const QString &category );
101
102 /**
103 * Removes this event from all categories
104 */
61 void clearCategories(); 105 void clearCategories();
106
107 /**
108 * This todo belongs to xxx categories
109 */
62 void setCategories(const QStringList& ); 110 void setCategories(const QStringList& );
63 111
112 /**
113 * Set the priority of the Todo
114 */
64 void setPriority(int priority ); 115 void setPriority(int priority );
116
117 /**
118 * set the end date
119 */
65 void setDate( QDate date ); 120 void setDate( QDate date );
66 void setDescription(const QString& ); 121 void setDescription(const QString& );
122 void setSummary(const QString& );
123 void setExtra( const QString&, const QString& );
67 bool isOverdue(); 124 bool isOverdue();
@@ -87,2 +144,4 @@ class ToDoEvent {
87 QString m_desc; 144 QString m_desc;
145 QString m_sum;
146 QMap<QString, QString> m_extra;
88 int m_uid; 147 int m_uid;
diff --git a/libopie/todovcalresource.cpp b/libopie/todovcalresource.cpp
index 75f2197..80f8c60 100644
--- a/libopie/todovcalresource.cpp
+++ b/libopie/todovcalresource.cpp
@@ -52,3 +52,3 @@ static VObject *vobjByEvent( const ToDoEvent &event )
52 addPropValue( task, VCDescriptionProp, event.description().local8Bit() ); 52 addPropValue( task, VCDescriptionProp, event.description().local8Bit() );
53 addPropValue( task, VCSummaryProp, event.description().left(15).local8Bit() ); 53 addPropValue( task, VCSummaryProp, event.summary().left(15).local8Bit() );
54 return task; 54 return task;
@@ -66,2 +66,7 @@ static ToDoEvent eventByVObj( VObject *obj ){
66 } 66 }
67 // summary
68 if ( ( ob = isAPropertyOf( obj, VCSummaryProp ) ) != 0 ) {
69 name = vObjectStringZValue( ob );
70 event.setSummary( name );
71 }
67 // completed 72 // completed