Added ORecur which is a base class for Recurrance extracted from TT Event class

and a widget where you can set the Recurrance
This will be used at least in Todolist and Datebook and in the common
classes of OTodo and OEvent

Fixed the SQL in multiple ways it's summary not description for example

12 files changed, 1709 insertions, 4 deletions

diff --git a/libopie/orecurrancebase.ui b/libopie/orecurrancebase.ui
new file mode 100644
index 0000000..baf79d3
--- a/dev/null
+++ b/libopie/orecurrancebase.ui
@@ -0,0 +1,713 @@
+<!DOCTYPE UI><UI>
+<class>ORecurranceBase</class>
+<comment>*********************************************************************
+** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+**
+** This file is part of Qtopia Environment.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+** $Id$
+**
+*********************************************************************</comment>
+<widget>
+    <class>QDialog</class>
+    <property stdset="1">
+        <name>name</name>
+        <cstring>ORecurranceBase</cstring>
+    </property>
+    <property stdset="1">
+        <name>geometry</name>
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>246</width>
+            <height>309</height>
+        </rect>
+    </property>
+    <property stdset="1">
+        <name>caption</name>
+        <string>Repeating Event </string>
+    </property>
+    <property>
+        <name>layoutMargin</name>
+    </property>
+    <property>
+        <name>layoutSpacing</name>
+    </property>
+    <vbox>
+        <property stdset="1">
+            <name>margin</name>
+            <number>5</number>
+        </property>
+        <property stdset="1">
+            <name>spacing</name>
+            <number>1</number>
+        </property>
+        <widget>
+            <class>QButtonGroup</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>fraType</cstring>
+            </property>
+            <property stdset="1">
+                <name>frameShape</name>
+                <enum>NoFrame</enum>
+            </property>
+            <property stdset="1">
+                <name>frameShadow</name>
+                <enum>Sunken</enum>
+            </property>
+            <property stdset="1">
+                <name>title</name>
+                <string></string>
+            </property>
+            <property stdset="1">
+                <name>exclusive</name>
+                <bool>true</bool>
+            </property>
+            <property>
+                <name>layoutMargin</name>
+            </property>
+            <property>
+                <name>layoutSpacing</name>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>5</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>1</number>
+                </property>
+                <widget>
+                    <class>QToolButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>cmdNone</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>None</string>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QToolButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>cmdDay</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Day</string>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QToolButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>cmdWeek</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>1</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Week</string>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QToolButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>cmdMonth</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>1</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Month</string>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QToolButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>cmdYear</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Year</string>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout4</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>lblEvery</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Every:</string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QSpinBox</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>spinFreq</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>minValue</name>
+                        <number>1</number>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>lblFreq</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>1</hsizetype>
+                            <vsizetype>1</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Frequency</string>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout8</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>lblEnd</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>1</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>End On:</string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QToolButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>cmdEnd</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>No End Date</string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QCheckBox</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>chkNoEnd</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>No End Date</string>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <widget>
+            <class>QButtonGroup</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>fraExtra</cstring>
+            </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>7</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
+                <name>frameShape</name>
+                <enum>Box</enum>
+            </property>
+            <property stdset="1">
+                <name>title</name>
+                <string>Repeat On</string>
+            </property>
+            <property>
+                <name>layoutMargin</name>
+            </property>
+            <property>
+                <name>layoutSpacing</name>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>5</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>1</number>
+                </property>
+                <widget>
+                    <class>QToolButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>cmdExtra1</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Mon</string>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QToolButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>cmdExtra2</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Tue</string>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QToolButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>cmdExtra3</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Wed</string>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QToolButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>cmdExtra4</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Thu</string>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QToolButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>cmdExtra5</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Fri</string>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QToolButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>cmdExtra6</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Sat</string>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QToolButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>cmdExtra7</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Sun</string>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                    <property stdset="1">
+                        <name>toggleButton</name>
+                        <bool>true</bool>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <widget>
+            <class>QFrame</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Frame3</cstring>
+            </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>7</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
+                <name>frameShape</name>
+                <enum>Box</enum>
+            </property>
+            <property stdset="1">
+                <name>frameShadow</name>
+                <enum>Sunken</enum>
+            </property>
+            <property>
+                <name>layoutMargin</name>
+            </property>
+            <property>
+                <name>layoutSpacing</name>
+            </property>
+            <vbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>5</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>1</number>
+                </property>
+                <widget>
+                    <class>QLayoutWidget</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>Layout6</cstring>
+                    </property>
+                    <property>
+                        <name>layoutSpacing</name>
+                    </property>
+                    <hbox>
+                        <property stdset="1">
+                            <name>margin</name>
+                            <number>0</number>
+                        </property>
+                        <property stdset="1">
+                            <name>spacing</name>
+                            <number>0</number>
+                        </property>
+                        <widget>
+                            <class>QLabel</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>lblRepeat</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>sizePolicy</name>
+                                <sizepolicy>
+                                    <hsizetype>1</hsizetype>
+                                    <vsizetype>3</vsizetype>
+                                </sizepolicy>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>Every</string>
+                            </property>
+                            <property stdset="1">
+                                <name>alignment</name>
+                                <set>AlignTop|AlignLeft</set>
+                            </property>
+                            <property>
+                                <name>hAlign</name>
+                            </property>
+                            <property>
+                                <name>vAlign</name>
+                            </property>
+                        </widget>
+                        <widget>
+                            <class>QLabel</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>lblVar1</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>sizePolicy</name>
+                                <sizepolicy>
+                                    <hsizetype>1</hsizetype>
+                                    <vsizetype>1</vsizetype>
+                                </sizepolicy>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>Var1</string>
+                            </property>
+                            <property stdset="1">
+                                <name>alignment</name>
+                                <set>AlignTop|AlignLeft</set>
+                            </property>
+                            <property>
+                                <name>hAlign</name>
+                            </property>
+                            <property>
+                                <name>vAlign</name>
+                            </property>
+                        </widget>
+                        <widget>
+                            <class>QLabel</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>lblVar2</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>sizePolicy</name>
+                                <sizepolicy>
+                                    <hsizetype>4</hsizetype>
+                                    <vsizetype>1</vsizetype>
+                                </sizepolicy>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>Var 2</string>
+                            </property>
+                            <property stdset="1">
+                                <name>alignment</name>
+                                <set>AlignTop|AlignRight</set>
+                            </property>
+                            <property>
+                                <name>hAlign</name>
+                            </property>
+                            <property>
+                                <name>vAlign</name>
+                            </property>
+                        </widget>
+                    </hbox>
+                </widget>
+                <widget>
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>lblWeekVar</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>1</hsizetype>
+                            <vsizetype>7</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>WeekVar</string>
+                    </property>
+                    <property stdset="1">
+                        <name>alignment</name>
+                        <set>AlignTop|AlignHCenter</set>
+                    </property>
+                    <property>
+                        <name>hAlign</name>
+                    </property>
+                    <property>
+                        <name>vAlign</name>
+                    </property>
+                </widget>
+            </vbox>
+        </widget>
+    </vbox>
+</widget>
+<connections>
+    <connection>
+        <sender>chkNoEnd</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>cmdEnd</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>chkNoEnd</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>ORecurranceBase</receiver>
+        <slot>slotNoEnd(bool)</slot>
+    </connection>
+    <connection>
+        <sender>spinFreq</sender>
+        <signal>valueChanged(int)</signal>
+        <receiver>lblVar1</receiver>
+        <slot>setNum(int)</slot>
+    </connection>
+    <connection>
+        <sender>spinFreq</sender>
+        <signal>valueChanged(int)</signal>
+        <receiver>ORecurranceBase</receiver>
+        <slot>setupRepeatLabel( int )</slot>
+    </connection>
+    <connection>
+        <sender>fraType</sender>
+        <signal>clicked(int)</signal>
+        <receiver>ORecurranceBase</receiver>
+        <slot>slotSetRType( int )</slot>
+    </connection>
+    <connection>
+        <sender>fraExtra</sender>
+        <signal>clicked(int)</signal>
+        <receiver>ORecurranceBase</receiver>
+        <slot>slotMonthLabel( int )</slot>
+    </connection>
+    <connection>
+        <sender>fraExtra</sender>
+        <signal>clicked(int)</signal>
+        <receiver>ORecurranceBase</receiver>
+        <slot>slotWeekLabel()</slot>
+    </connection>
+    <slot access="public">setupRepeatLabel( const QString &amp; )</slot>
+    <slot access="public">setupRepeatLabel( int )</slot>
+    <slot access="public">slotMonthLabel( int )</slot>
+    <slot access="public">slotNoEnd(bool)</slot>
+    <slot access="public">slotSetRType( int )</slot>
+    <slot access="public">slotWeekLabel()</slot>
+</connections>
+</UI>
diff --git a/libopie/orecurrancewidget.cpp b/libopie/orecurrancewidget.cpp
new file mode 100644
index 0000000..53cee65
--- a/dev/null
+++ b/libopie/orecurrancewidget.cpp
@@ -0,0 +1,556 @@
+#include <qapplication.h>
+#include <qlabel.h>
+#include <qpopupmenu.h>
+#include <qspinbox.h>
+
+#include <qpe/timestring.h>
+
+#include "orecurrancewidget.h"
+
+// Global Templates for use in setting up the repeat label...
+const QString strDayTemplate = QObject::tr("Every");
+const QString strYearTemplate = QObject::tr("%1 %2 every ");
+const QString strMonthDateTemplate = QObject::tr("The %1 every ");
+const QString strMonthDayTemplate = QObject::tr("The %1 %1 of every");
+const QString strWeekTemplate = QObject::tr("Every ");
+const QString dayLabel[] = { QObject::tr("Monday"),
+                             QObject::tr("Tuesday"),
+			     QObject::tr("Wednesday"),
+			     QObject::tr("Thursday"),
+			     QObject::tr("Friday"),
+			     QObject::tr("Saturday"),
+			     QObject::tr("Sunday") };
+
+
+static QString numberPlacing( int x );	// return the proper word format for
+                                        // x (1st, 2nd, etc)
+static int week( const QDate &dt );    // what week in the month is dt?
+
+
+ORecurranceWidget::ORecurranceWidget( bool startOnMonday,
+                                      const QDate& newStart,
+                                      QWidget* parent,
+                                      const char* name,
+                                      bool modal,
+                                      WFlags fl )
+    : ORecurranceBase( parent, name, modal, fl ),
+      start( newStart ),
+      currInterval( None ),
+      startWeekOnMonday( startOnMonday )
+{
+    init();
+    fraType->setButton( currInterval );
+    chkNoEnd->setChecked( TRUE );
+    setupNone();
+}
+ORecurranceWidget::ORecurranceWidget( bool startOnMonday,
+                                      const ORecur& rp, const QDate& startDate,
+                                      QWidget* parent, const char* name,
+                                      bool modal, WFlags fl)
+    : ORecurranceBase( parent, name, modal, fl ),
+      start( startDate ),
+      end( rp.endDate() ),
+      startWeekOnMonday( startOnMonday )
+{
+    // do some stuff with the repeat pattern
+    init();
+    switch ( rp.type() ) {
+    default:
+    case ORecur::NoRepeat:
+        currInterval = None;
+        setupNone();
+        break;
+    case ORecur::Daily:
+        currInterval = Day;
+        setupDaily();
+        break;
+    case ORecur::Weekly:
+        currInterval = Week;
+        setupWeekly();
+        int day, buttons;
+        for ( day = 0x01, buttons = 0; buttons < 7;
+              day = day << 1, buttons++ ) {
+            if ( rp.days() & day ) {
+                if ( startWeekOnMonday )
+                    fraExtra->setButton( buttons );
+                else {
+                    if ( buttons == 7 )
+                        fraExtra->setButton( 0 );
+                    else
+                        fraExtra->setButton( buttons + 1 );
+ 		    }
+		}
+	    }
+        slotWeekLabel();
+        break;
+    case ORecur::MonthlyDay:
+        currInterval = Month;
+        setupMonthly();
+        fraExtra->setButton( 0 );
+        slotMonthLabel( 0 );
+        break;
+    case ORecur::MonthlyDate:
+        currInterval = Month;
+        setupMonthly();
+        fraExtra->setButton( 1 );
+        slotMonthLabel( 1 );
+        break;
+    case ORecur::Yearly:
+        currInterval = Year;
+        setupYearly();
+        break;
+    }
+    fraType->setButton( currInterval );
+    spinFreq->setValue( rp.frequency() );
+    if ( !rp.hasEndDate() ) {
+	cmdEnd->setText( tr("No End Date") );
+	chkNoEnd->setChecked( TRUE );
+    } else
+	cmdEnd->setText( TimeString::shortDate( end ) );
+}
+ORecurranceWidget::~ORecurranceWidget() {
+
+}
+ORecur ORecurranceWidget::recurrance()const {
+    QListIterator<QToolButton> it( listRTypeButtons );
+    QListIterator<QToolButton> itExtra( listExtra );
+    ORecur rpTmp;
+    int i;
+    for ( i = 0; *it; ++it, i++ ) {
+	if ( (*it)->isOn() ) {
+	    switch ( i ) {
+            case None:
+                rpTmp.setType( ORecur::NoRepeat );
+                break;
+            case Day:
+                rpTmp.setType( ORecur::Daily );
+                break;
+            case Week:{
+                rpTmp.setType( ORecur::Weekly );
+                int day;
+                int day2 = 0;
+                for ( day = 1; *itExtra; ++itExtra, day = day << 1 ) {
+                    if ( (*itExtra)->isOn() ) {
+                        if ( startWeekOnMonday )
+                            day2 |= day;
+                        else {
+                            if ( day == 1 )
+                                day2 |= Event::SUN;
+                            else
+                                day2 |= day >> 1;
+                        }
+                    }
+                }
+                rpTmp.setDays( day2 );
+            }
+                break;
+            case Month:
+                if ( cmdExtra1->isOn() )
+                    rpTmp.setType( ORecur::MonthlyDay );
+                else if ( cmdExtra2->isOn() )
+                    rpTmp.setType( ORecur::MonthlyDate );
+                // figure out the montly day...
+                rpTmp.setPosition(  week( start ) );
+                break;
+            case Year:
+                rpTmp.setType( ORecur::Yearly );
+                break;
+	    }
+	    break;  // no need to keep looking!
+	}
+    }
+    rpTmp.setFrequency(spinFreq->value() );
+    rpTmp.setHasEndDate( !chkNoEnd->isChecked() );
+    if ( rpTmp.hasEndDate() ) {
+	rpTmp.setEndDate( end );
+    }
+    // timestamp it...
+    rpTmp.setCreateTime( time( NULL ) );
+    return rpTmp;
+}
+QDate ORecurranceWidget::endDate()const {
+    return end;
+}
+void ORecurranceWidget::slotSetRType(int rtype) {
+   // now call the right function based on the type...
+    currInterval = static_cast<repeatButtons>(rtype);
+    switch ( currInterval ) {
+    case None:
+        setupNone();
+        break;
+    case Day:
+        setupDaily();
+        break;
+    case Week:
+        setupWeekly();
+        slotWeekLabel();
+        break;
+    case Month:
+        setupMonthly();
+        cmdExtra2->setOn( TRUE );
+        slotMonthLabel( 1 );
+        break;
+    case Year:
+        setupYearly();
+        break;
+    }
+}
+void ORecurranceWidget::endDateChanged(int y, int m, int d) {
+    end.setYMD( y, m, d );
+    if ( end < start )
+	end = start;
+    cmdEnd->setText(  TimeString::shortDate( end ) );
+    repeatPicker->setDate( end.year(), end.month(), end.day() );
+}
+void ORecurranceWidget::slotNoEnd( bool unused) {
+    // if the item was toggled, then go ahead and set it to the maximum date
+    if ( unused ) {
+	end.setYMD( 3000, 12, 31 );
+	cmdEnd->setText( tr("No End Date") );
+    } else {
+	end = start;
+	cmdEnd->setText( TimeString::shortDate(end) );
+    }
+}
+void ORecurranceWidget::setupRepeatLabel( const QString& s) {
+    lblVar1->setText( s );
+}
+void ORecurranceWidget::setupRepeatLabel( int x) {
+    // change the spelling based on the value of x
+    QString strVar2;
+
+    if ( x > 1 )
+	lblVar1->show();
+    else
+	lblVar1->hide();
+
+    switch ( currInterval ) {
+	case None:
+	    break;
+	case Day:
+	    if ( x > 1 )
+		strVar2 = tr( "days" );
+	    else
+		strVar2 = tr( "day" );
+	    break;
+	case Week:
+	    if ( x > 1 )
+		strVar2 = tr( "weeks" );
+	    else
+		strVar2 = tr( "week" );
+	    break;
+	case Month:
+	    if ( x > 1 )
+		strVar2 = tr( "months" );
+	    else
+		strVar2 = tr( "month" );
+	    break;
+	case Year:
+	    if ( x > 1 )
+		strVar2 = tr( "years" );
+	    else
+		strVar2 = tr( "year" );
+	    break;
+    }
+    if ( !strVar2.isNull() )
+	lblVar2->setText( strVar2 );
+}
+void ORecurranceWidget::slotWeekLabel() {
+    QString str;
+    QListIterator<QToolButton> it( listExtra );
+    unsigned int i;
+    unsigned int keepMe;
+    bool bNeedCarriage = FALSE;
+    // don't do something we'll regret!!!
+    if ( currInterval != Week )
+	return;
+
+    if ( startWeekOnMonday )
+	keepMe = start.dayOfWeek() - 1;
+    else
+	keepMe = start.dayOfWeek() % 7;
+
+    QStringList list;
+    for ( i = 0; *it; ++it, i++ ) {
+	// a crazy check, if you are repeating weekly, the current day
+	// must be selected!!!
+	if ( i == keepMe && !( (*it)->isOn() ) )
+	    (*it)->setOn( TRUE );
+	if ( (*it)->isOn() ) {
+	    if ( startWeekOnMonday )
+		list.append( dayLabel[i] );
+	    else {
+		if ( i == 0 )
+		    list.append( dayLabel[6] );
+		else
+		    list.append( dayLabel[i - 1] );
+	    }
+	}
+    }
+    QStringList::Iterator itStr;
+    for ( i = 0, itStr = list.begin(); itStr != list.end(); ++itStr, i++ ) {
+	if ( i == 3 )
+	    bNeedCarriage = TRUE;
+	else
+	    bNeedCarriage = FALSE;
+	if ( str.isNull() )
+	    str = *itStr;
+	else if ( i == list.count() - 1 ) {
+	    if ( i < 2 )
+		str += tr(" and ") + *itStr;
+	    else {
+		if ( bNeedCarriage )
+		    str += tr( ",\nand " ) + *itStr;
+		else
+		    str += tr( ", and " ) + *itStr;
+	    }
+	} else {
+	    if ( bNeedCarriage )
+		str += ",\n" + *itStr;
+	    else
+		str += ", " + *itStr;
+	}
+    }
+    str = str.prepend( "on " );
+    lblWeekVar->setText( str );
+}
+void ORecurranceWidget::slotMonthLabel(int type) {
+    QString str;
+    if ( currInterval != Month || type > 1 )
+	return;
+    if ( type == 1 )
+	str = strMonthDateTemplate.arg( numberPlacing(start.day()) );
+    else
+	str = strMonthDayTemplate.arg( numberPlacing(week(start)))
+	      .arg( dayLabel[start.dayOfWeek() - 1] );
+    lblRepeat->setText( str );
+}
+void ORecurranceWidget::slotChangeStartOfWeek( bool onMonday ) {
+ startWeekOnMonday = onMonday;
+    // we need to make this unintrusive as possible...
+    int saveSpin = spinFreq->value();
+    char days = 0;
+    int day;
+    QListIterator<QToolButton> itExtra( listExtra );
+    for ( day = 1; *itExtra; ++itExtra, day = day << 1 ) {
+	if ( (*itExtra)->isOn() ) {
+	    if ( !startWeekOnMonday )
+		days |= day;
+	    else {
+		if ( day == 1 )
+		    days |= ORecur::SUN;
+		else
+		    days |= day >> 1;
+	    }
+	}
+    }
+    setupWeekly();
+    spinFreq->setValue( saveSpin );
+    int buttons;
+    for ( day = 0x01, buttons = 0; buttons < 7;
+	  day = day << 1, buttons++ ) {
+	if ( days & day ) {
+	    if ( startWeekOnMonday )
+		fraExtra->setButton( buttons );
+	    else {
+		if ( buttons == 7 )
+		    fraExtra->setButton( 0 );
+		else
+		    fraExtra->setButton( buttons + 1 );
+	    }
+	}
+    }
+    slotWeekLabel();
+}
+void ORecurranceWidget::setupNone() {
+   lblRepeat->setText( tr("No Repeat") );
+    lblVar1->hide();
+    lblVar2->hide();
+    hideExtras();
+    cmdEnd->hide();
+    lblFreq->hide();
+    lblEvery->hide();
+    lblFreq->hide();
+    spinFreq->hide();
+    lblEnd->hide();
+    lblWeekVar->hide();
+}
+void ORecurranceWidget::setupDaily() {
+  hideExtras();
+    lblWeekVar->hide();
+    spinFreq->setValue( 1 );
+    lblFreq->setText( tr("day(s)") );
+    lblVar2->show();
+    showRepeatStuff();
+    lblRepeat->setText( strDayTemplate );
+    setupRepeatLabel( 1 );
+}
+void ORecurranceWidget::setupWeekly() {
+// reshow the buttons...
+    fraExtra->setTitle( tr("Repeat On") );
+    fraExtra->setExclusive( FALSE );
+    fraExtra->show();
+    if ( startWeekOnMonday ) {
+	cmdExtra1->setText( tr("Mon") );
+	cmdExtra2->setText( tr("Tue") );
+	cmdExtra3->setText( tr("Wed") );
+	cmdExtra4->setText( tr("Thu") );
+	cmdExtra5->setText( tr("Fri") );
+	cmdExtra6->setText( tr("Sat") );
+	cmdExtra7->setText( tr("Sun") );
+    } else {
+	cmdExtra1->setText( tr("Sun") );
+	cmdExtra2->setText( tr("Mon") );
+	cmdExtra3->setText( tr("Tue") );
+	cmdExtra4->setText( tr("Wed") );
+	cmdExtra5->setText( tr("Thu") );
+	cmdExtra6->setText( tr("Fri") );
+	cmdExtra7->setText( tr("Sat") );
+    }
+    // I hope clustering these improve performance....
+    cmdExtra1->setOn( FALSE );
+    cmdExtra2->setOn( FALSE );
+    cmdExtra3->setOn( FALSE );
+    cmdExtra4->setOn( FALSE );
+    cmdExtra5->setOn( FALSE );
+    cmdExtra6->setOn( FALSE );
+    cmdExtra7->setOn( FALSE );
+
+    cmdExtra1->show();
+    cmdExtra2->show();
+    cmdExtra3->show();
+    cmdExtra4->show();
+    cmdExtra5->show();
+    cmdExtra6->show();
+    cmdExtra7->show();
+
+    lblWeekVar->show();
+    spinFreq->setValue( 1 );
+    // might as well set the day too...
+    if ( startWeekOnMonday ) {
+	fraExtra->setButton( start.dayOfWeek() - 1 );
+    } else {
+	fraExtra->setButton( start.dayOfWeek() % 7 );
+    }
+    lblFreq->setText( tr("week(s)") );
+    lblVar2->show();
+    showRepeatStuff();
+    setupRepeatLabel( 1 );
+}
+void ORecurranceWidget::setupMonthly() {
+    hideExtras();
+    lblWeekVar->hide();
+    fraExtra->setTitle( tr("Repeat By") );
+    fraExtra->setExclusive( TRUE );
+    fraExtra->show();
+    cmdExtra1->setText( tr("Day") );
+    cmdExtra1->show();
+    cmdExtra2->setText( tr("Date") );
+    cmdExtra2->show();
+    spinFreq->setValue( 1 );
+    lblFreq->setText( tr("month(s)") );
+    lblVar2->show();
+    showRepeatStuff();
+    setupRepeatLabel( 1 );
+}
+void ORecurranceWidget::setupYearly() {
+hideExtras();
+    lblWeekVar->hide();
+    spinFreq->setValue( 1 );
+    lblFreq->setText( tr("year(s)") );
+    lblFreq->show();
+    lblFreq->show();
+    showRepeatStuff();
+    lblVar2->show();
+    QString strEvery = strYearTemplate.arg( start.monthName(start.month()) ).arg( numberPlacing(start.day()) );
+    lblRepeat->setText( strEvery );
+    setupRepeatLabel( 1 );
+
+}
+void ORecurranceWidget::init() {
+ QPopupMenu *m1 = new QPopupMenu( this );
+    repeatPicker = new DateBookMonth( m1, 0, TRUE );
+    m1->insertItem( repeatPicker );
+    cmdEnd->setPopup( m1 );
+    cmdEnd->setPopupDelay( 0 );
+
+    QObject::connect( repeatPicker, SIGNAL(dateClicked(int, int, int)),
+                      this, SLOT(endDateChanged(int, int, int)) );
+    QObject::connect( qApp, SIGNAL(weekChanged(bool)),
+		      this, SLOT(slotChangeStartOfWeek(bool)) );
+
+    listRTypeButtons.setAutoDelete( TRUE );
+    listRTypeButtons.append( cmdNone );
+    listRTypeButtons.append( cmdDay );
+    listRTypeButtons.append( cmdWeek );
+    listRTypeButtons.append( cmdMonth );
+    listRTypeButtons.append( cmdYear );
+
+    listExtra.setAutoDelete( TRUE );
+    listExtra.append( cmdExtra1 );
+    listExtra.append( cmdExtra2 );
+    listExtra.append( cmdExtra3 );
+    listExtra.append( cmdExtra4 );
+    listExtra.append( cmdExtra5 );
+    listExtra.append( cmdExtra6 );
+    listExtra.append( cmdExtra7 );
+}
+void ORecurranceWidget::hideExtras() {
+      // hide the extra buttons...
+    fraExtra->hide();
+    chkNoEnd->hide();
+    QListIterator<QToolButton> it( listExtra );
+    for ( ; *it; ++it ) {
+	(*it)->hide();
+	(*it)->setOn( FALSE );
+    }
+}
+void ORecurranceWidget::showRepeatStuff() {
+    cmdEnd->show();
+    chkNoEnd->show();
+    lblFreq->show();
+    lblEvery->show();
+    lblFreq->show();
+    spinFreq->show();
+    lblEnd->show();
+    lblRepeat->setText( tr("Every") );
+}
+
+
+static int week( const QDate &start )
+{
+    // figure out the week...
+    int stop = start.day(),
+        sentinel = start.dayOfWeek(),
+        dayOfWeek = QDate( start.year(), start.month(), 1 ).dayOfWeek(),
+        week = 1,
+	i;
+    for ( i = 1; i < stop; i++ ) {
+	if ( dayOfWeek++ == sentinel )
+	    week++;
+	if ( dayOfWeek > 7 )
+	    dayOfWeek = 0;
+    }
+    return week;
+}
+
+static QString numberPlacing( int x )
+{
+    // I hope this works in other languages besides english...
+    QString str = QString::number( x );
+    switch ( x % 10 ) {
+	case 1:
+	    str += QWidget::tr( "st" );
+	    break;
+	case 2:
+	    str += QWidget::tr( "nd" );
+	    break;
+	case 3:
+	    str += QWidget::tr( "rd" );
+	    break;
+	default:
+	    str += QWidget::tr( "th" );
+	    break;
+    }
+    return str;
+}
diff --git a/libopie/orecurrancewidget.h b/libopie/orecurrancewidget.h
new file mode 100644
index 0000000..f2d7f87
--- a/dev/null
+++ b/libopie/orecurrancewidget.h
@@ -0,0 +1,68 @@
+/*
+ * GPL and based on the widget from TT
+ */
+
+#ifndef OPIE_RECURRANCE_WIDGET_H
+#define OPIE_RECURRANCE_WIDGET_H
+
+#include <qlist.h>
+#include <qtoolbutton.h>
+#include <qcheckbox.h>
+#include <qdatetime.h>
+#include <qbuttongroup.h>
+
+#include <qpe/datebookmonth.h>
+
+#include "orecurrancebase.h"
+#include <opie/orecur.h>
+
+class ORecurranceWidget : public ORecurranceBase {
+    Q_OBJECT
+public:
+    ORecurranceWidget( bool startOnMonday,
+                       const QDate& start, QWidget* parent = 0,
+                       const char* name = 0,  bool modal = TRUE,
+                       WFlags fl = 0 );
+    ORecurranceWidget( bool startOnMonday,
+                       const ORecur& rp, const QDate& start,
+                       QWidget* parent = 0, const char* name =0,
+                       bool modal = TRUE, WFlags = 0 );
+    ~ORecurranceWidget();
+    ORecur recurrance()const;
+    QDate endDate()const;
+
+public slots:
+    void slotSetRType( int );
+    void endDateChanged( int, int, int );
+    void slotNoEnd( bool unused );
+
+private slots:
+    void setupRepeatLabel( const QString& );
+    void setupRepeatLabel( int );
+    void slotWeekLabel();
+    void slotMonthLabel( int );
+    void slotChangeStartOfWeek( bool onMonday );
+
+private:
+    void setupNone();
+    void setupDaily();
+    void setupWeekly();
+    void setupMonthly();
+    void setupYearly();
+
+    enum repeatButtons { None, Day, Week, Month, Year };
+    void init();
+    void hideExtras();
+    void showRepeatStuff();
+
+    QList<QToolButton> listRTypeButtons;
+    QList<QToolButton> listExtra;
+    QDate start;    // only used in one spot...
+    QDate end;
+    repeatButtons currInterval;
+    bool startWeekOnMonday : 1;
+    DateBookMonth *repeatPicker;
+
+};
+
+#endif
diff --git a/libopie/pim/libopie.pro b/libopie/pim/libopie.pro
index 1dacbe7..b871374 100644
--- a/libopie/pim/libopie.pro
+++ b/libopie/pim/libopie.pro
@@ -26,9 +26,10 @@ HEADERS   = ofontmenu.h \
     pim/otodacessbackend.h \
     pim/ocontact.h \
     pim/ocontactaccess.h \
     pim/ocontactaccessbackend.h \
-    pim/ocontactaccessbackend_xml.h
+    pim/ocontactaccessbackend_xml.h \
+    pim/orecord.h
     
 SOURCES   = ofontmenu.cc  \
 	    xmltree.cc \
 	    tododb.cpp todoevent.cpp \
@@ -49,9 +50,10 @@ SOURCES   = ofontmenu.cc  \
              pim/opimrecord.cpp \
 	     pim/otodoaccess.cpp \
 	     pim/otodoaccessbackend.cpp \
              pim/ocontact.cpp \
-             pim/ocontactaccess.cpp
+             pim/ocontactaccess.cpp \
+	     pim/orecord.cpp
 
 TARGET    = opie
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(QTDIR)/lib$(PROJMAK)
diff --git a/libopie/pim/orecordlist.h b/libopie/pim/orecordlist.h
index 5404910..e377447 100644
--- a/libopie/pim/orecordlist.h
+++ b/libopie/pim/orecordlist.h
@@ -259,8 +259,10 @@ uint ORecordList<T>::count()const {
 return m_ids.count();
 }
 template <class T>
 T ORecordList<T>::operator[]( uint i ) {
+    if ( i < 0 || (i+1) > m_ids.count() )
+        return T();
     /* forward */
     return m_acc->find( m_ids[i], m_ids, i );
 }
 template <class T>
diff --git a/libopie/pim/orecur.cpp b/libopie/pim/orecur.cpp
new file mode 100644
index 0000000..6c81f8f
--- a/dev/null
+++ b/libopie/pim/orecur.cpp
@@ -0,0 +1,127 @@
+#include <qshared.h>
+
+#include <qtopia/timeconversion.h>
+
+#include "orecur.h"
+
+struct ORecur::Data : public QShared {
+    Data() : QShared() {
+        type = ORecur::NoRepeat;
+        freq = -1;
+        days = 0;
+        pos = 0;
+        create = -1;
+        hasEnd = FALSE;
+        end = 0;
+    }
+    char days; // Q_UINT8 for 8 seven days;)
+    ORecur::RepeatType type;
+    int freq;
+    int pos;
+    bool hasEnd : 1;
+    time_t end;
+    time_t create;
+};
+
+
+ORecur::ORecur() {
+    data = new Data;
+}
+ORecur::ORecur( const ORecur& rec)
+    : data( rec.data )
+{
+    data->ref();
+}
+ORecur::~ORecur() {
+    if ( data->deref() ) {
+        delete data;
+        data = 0l;
+    }
+}
+void ORecur::deref() {
+    if ( data->deref() ) {
+        delete data;
+        data = 0l;
+    }
+}
+bool ORecur::operator==( const ORecur& )const {
+    return false;
+}
+ORecur &ORecur::operator=( const ORecur& re) {
+    re.data->ref();
+    deref();
+    data = re.data;
+
+    return *this;
+}
+ORecur::RepeatType ORecur::type()const{
+    return data->type;
+}
+int ORecur::frequency()const {
+    return data->freq;
+}
+int ORecur::position()const {
+    return data->pos;
+}
+char ORecur::days() const{
+    return data->days;
+}
+bool ORecur::hasEndDate()const {
+    return data->hasEnd;
+}
+QDate ORecur::endDate()const {
+    return TimeConversion::fromUTC( data->end ).date();
+}
+time_t ORecur::endDateUTC()const {
+    return data->end;
+}
+time_t ORecur::createTime()const {
+    return data->create;
+}
+void ORecur::setType( const RepeatType& z) {
+    checkOrModify();
+    data->type = z;
+}
+void ORecur::setFrequency( int freq ) {
+    checkOrModify();
+    data->freq = freq;
+}
+void ORecur::setPosition( int pos ) {
+    checkOrModify();
+    data->pos = pos;
+}
+void ORecur::setDays( char c ) {
+    checkOrModify();
+    data->days = c;
+}
+void ORecur::setEndDate( const QDate& dt) {
+    checkOrModify();
+    data->end = TimeConversion::toUTC( dt );
+}
+void ORecur::setEndDateUTC( time_t t) {
+    checkOrModify();
+    data->end = t;
+}
+void ORecur::setCreateTime( time_t t) {
+    checkOrModify();
+    data->create = t;
+}
+void ORecur::setHasEndDate( bool b) {
+    checkOrModify();
+    data->hasEnd = b;
+}
+void ORecur::checkOrModify() {
+    if ( data->count !=  1 ) {
+        data->deref();
+        Data* d2 = new Data;
+        d2->days = data->days;
+        d2->type = data->type;
+        d2->freq = data->freq;
+        d2->pos  = data->pos;
+        d2->hasEnd = data->hasEnd;
+        d2->end  = data->end;
+        d2->create = data->create;
+        data = d2;
+    }
+}
+
diff --git a/libopie/pim/orecur.h b/libopie/pim/orecur.h
new file mode 100644
index 0000000..89258f8
--- a/dev/null
+++ b/libopie/pim/orecur.h
@@ -0,0 +1,54 @@
+/*
+ * GPL from TT
+ */
+
+#ifndef OPIE_RECUR_H
+#define OPIE_RECUR_H
+
+#include <sys/types.h>
+
+#include <qdatetime.h>
+
+
+
+class ORecur {
+public:
+    enum RepeatType{ NoRepeat = -1, Daily, Weekly, MonthlyDay,
+                     MonthlyDate, Yearly };
+    enum Days { MON = 0x01, TUE = 0x02, WED = 0x04, THU = 0x08,
+                FRI = 0x10, SAT = 0x20, SUN = 0x40 };
+    ORecur();
+    ORecur( const ORecur& );
+    ~ORecur();
+
+    ORecur &operator=( const ORecur& );
+    bool operator==(const ORecur& )const;
+    RepeatType type()const;
+    int frequency()const;
+    int position()const;
+    char days()const;
+    bool hasEndDate()const;
+    QDate endDate()const;
+    time_t endDateUTC()const;
+    time_t createTime()const;
+
+    void setType( const RepeatType& );
+    void setFrequency( int freq );
+    void setPosition( int pos );
+    void setDays( char c);
+    void setEndDate( const QDate& dt );
+    void setEndDateUTC( time_t );
+    void setCreateTime( time_t );
+    void setHasEndDate( bool b );
+private:
+    void deref();
+    inline void checkOrModify();
+
+
+    class Data;
+    Data* data;
+    class ORecurPrivate;
+    ORecurPrivate *d;
+};
+
+#endif
diff --git a/libopie/pim/otodoaccesssql.cpp b/libopie/pim/otodoaccesssql.cpp
index 8c2ea3a..761d7d8 100644
--- a/libopie/pim/otodoaccesssql.cpp
+++ b/libopie/pim/otodoaccesssql.cpp
@@ -420,9 +420,9 @@ QArray<int> OTodoAccessBackendSQL::sorted( bool asc, int sortOrder,
     case 1:
         query += "priority";
         break;
     case 2:
-        query += "description";
+        query += "summary";
         break;
     case 3:
         query += "DueDate";
         break;
diff --git a/libopie2/opiepim/backend/otodoaccesssql.cpp b/libopie2/opiepim/backend/otodoaccesssql.cpp
index 8c2ea3a..761d7d8 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.cpp
+++ b/libopie2/opiepim/backend/otodoaccesssql.cpp
@@ -420,9 +420,9 @@ QArray<int> OTodoAccessBackendSQL::sorted( bool asc, int sortOrder,
     case 1:
         query += "priority";
         break;
     case 2:
-        query += "description";
+        query += "summary";
         break;
     case 3:
         query += "DueDate";
         break;
diff --git a/libopie2/opiepim/core/orecur.cpp b/libopie2/opiepim/core/orecur.cpp
new file mode 100644
index 0000000..6c81f8f
--- a/dev/null
+++ b/libopie2/opiepim/core/orecur.cpp
@@ -0,0 +1,127 @@
+#include <qshared.h>
+
+#include <qtopia/timeconversion.h>
+
+#include "orecur.h"
+
+struct ORecur::Data : public QShared {
+    Data() : QShared() {
+        type = ORecur::NoRepeat;
+        freq = -1;
+        days = 0;
+        pos = 0;
+        create = -1;
+        hasEnd = FALSE;
+        end = 0;
+    }
+    char days; // Q_UINT8 for 8 seven days;)
+    ORecur::RepeatType type;
+    int freq;
+    int pos;
+    bool hasEnd : 1;
+    time_t end;
+    time_t create;
+};
+
+
+ORecur::ORecur() {
+    data = new Data;
+}
+ORecur::ORecur( const ORecur& rec)
+    : data( rec.data )
+{
+    data->ref();
+}
+ORecur::~ORecur() {
+    if ( data->deref() ) {
+        delete data;
+        data = 0l;
+    }
+}
+void ORecur::deref() {
+    if ( data->deref() ) {
+        delete data;
+        data = 0l;
+    }
+}
+bool ORecur::operator==( const ORecur& )const {
+    return false;
+}
+ORecur &ORecur::operator=( const ORecur& re) {
+    re.data->ref();
+    deref();
+    data = re.data;
+
+    return *this;
+}
+ORecur::RepeatType ORecur::type()const{
+    return data->type;
+}
+int ORecur::frequency()const {
+    return data->freq;
+}
+int ORecur::position()const {
+    return data->pos;
+}
+char ORecur::days() const{
+    return data->days;
+}
+bool ORecur::hasEndDate()const {
+    return data->hasEnd;
+}
+QDate ORecur::endDate()const {
+    return TimeConversion::fromUTC( data->end ).date();
+}
+time_t ORecur::endDateUTC()const {
+    return data->end;
+}
+time_t ORecur::createTime()const {
+    return data->create;
+}
+void ORecur::setType( const RepeatType& z) {
+    checkOrModify();
+    data->type = z;
+}
+void ORecur::setFrequency( int freq ) {
+    checkOrModify();
+    data->freq = freq;
+}
+void ORecur::setPosition( int pos ) {
+    checkOrModify();
+    data->pos = pos;
+}
+void ORecur::setDays( char c ) {
+    checkOrModify();
+    data->days = c;
+}
+void ORecur::setEndDate( const QDate& dt) {
+    checkOrModify();
+    data->end = TimeConversion::toUTC( dt );
+}
+void ORecur::setEndDateUTC( time_t t) {
+    checkOrModify();
+    data->end = t;
+}
+void ORecur::setCreateTime( time_t t) {
+    checkOrModify();
+    data->create = t;
+}
+void ORecur::setHasEndDate( bool b) {
+    checkOrModify();
+    data->hasEnd = b;
+}
+void ORecur::checkOrModify() {
+    if ( data->count !=  1 ) {
+        data->deref();
+        Data* d2 = new Data;
+        d2->days = data->days;
+        d2->type = data->type;
+        d2->freq = data->freq;
+        d2->pos  = data->pos;
+        d2->hasEnd = data->hasEnd;
+        d2->end  = data->end;
+        d2->create = data->create;
+        data = d2;
+    }
+}
+
diff --git a/libopie2/opiepim/core/orecur.h b/libopie2/opiepim/core/orecur.h
new file mode 100644
index 0000000..89258f8
--- a/dev/null
+++ b/libopie2/opiepim/core/orecur.h
@@ -0,0 +1,54 @@
+/*
+ * GPL from TT
+ */
+
+#ifndef OPIE_RECUR_H
+#define OPIE_RECUR_H
+
+#include <sys/types.h>
+
+#include <qdatetime.h>
+
+
+
+class ORecur {
+public:
+    enum RepeatType{ NoRepeat = -1, Daily, Weekly, MonthlyDay,
+                     MonthlyDate, Yearly };
+    enum Days { MON = 0x01, TUE = 0x02, WED = 0x04, THU = 0x08,
+                FRI = 0x10, SAT = 0x20, SUN = 0x40 };
+    ORecur();
+    ORecur( const ORecur& );
+    ~ORecur();
+
+    ORecur &operator=( const ORecur& );
+    bool operator==(const ORecur& )const;
+    RepeatType type()const;
+    int frequency()const;
+    int position()const;
+    char days()const;
+    bool hasEndDate()const;
+    QDate endDate()const;
+    time_t endDateUTC()const;
+    time_t createTime()const;
+
+    void setType( const RepeatType& );
+    void setFrequency( int freq );
+    void setPosition( int pos );
+    void setDays( char c);
+    void setEndDate( const QDate& dt );
+    void setEndDateUTC( time_t );
+    void setCreateTime( time_t );
+    void setHasEndDate( bool b );
+private:
+    void deref();
+    inline void checkOrModify();
+
+
+    class Data;
+    Data* data;
+    class ORecurPrivate;
+    ORecurPrivate *d;
+};
+
+#endif
diff --git a/libopie2/opiepim/orecordlist.h b/libopie2/opiepim/orecordlist.h
index 5404910..e377447 100644
--- a/libopie2/opiepim/orecordlist.h
+++ b/libopie2/opiepim/orecordlist.h
@@ -259,8 +259,10 @@ uint ORecordList<T>::count()const {
 return m_ids.count();
 }
 template <class T>
 T ORecordList<T>::operator[]( uint i ) {
+    if ( i < 0 || (i+1) > m_ids.count() )
+        return T();
     /* forward */
     return m_acc->find( m_ids[i], m_ids, i );
 }
 template <class T>