summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/libopie.pro33
-rw-r--r--libopie/ofileselector/ofileselector.cpp345
-rw-r--r--libopie/ofileselector/ofileselector.h125
-rw-r--r--libopie/ofileselector/olister.h1
-rw-r--r--libopie/pim/opimrecord.cpp26
-rw-r--r--libopie/pim/opimrecord.h4
-rw-r--r--libopie/pim/otodo.cpp265
-rw-r--r--libopie/pim/otodo.h26
-rw-r--r--libopie2/opiepim/core/opimrecord.cpp26
-rw-r--r--libopie2/opiepim/core/opimrecord.h4
-rw-r--r--libopie2/opiepim/otodo.cpp265
-rw-r--r--libopie2/opiepim/otodo.h26
12 files changed, 443 insertions, 703 deletions
diff --git a/libopie/libopie.pro b/libopie/libopie.pro
index 6c47e86..70be6ac 100644
--- a/libopie/libopie.pro
+++ b/libopie/libopie.pro
@@ -2,4 +2,4 @@ TEMPLATE = lib
CONFIG += qte warn_on release
-HEADERS = ofontmenu.h ofileselector.h \
- ofiledialog.h tododb.h \
+HEADERS = ofontmenu.h \
+ tododb.h \
todoevent.h todoresource.h \
@@ -10,5 +10,16 @@ HEADERS = ofontmenu.h ofileselector.h \
otimepicker.h otabwidget.h \
- otabbar.h otabinfo.h
-SOURCES = ofontmenu.cc ofileselector.cc \
- ofiledialog.cc xmltree.cc \
+ otabbar.h otabinfo.h \
+ ofileselector/ofiledialog.h \
+ ofileselector/ofilelistview.h \
+ ofileselector/ofileselector.h \
+ ofileselector/ofileselectoritem.h \
+ ofileselector/ofileview.h \
+ ofileselector/olister.h \
+ ofileselector/olocallister.h \
+ ofileselector/ofileselectormain.h \
+ pim/opimrecord.h \
+ pim/otodo.h
+
+SOURCES = ofontmenu.cc \
+ xmltree.cc \
tododb.cpp todoevent.cpp \
@@ -18,3 +29,13 @@ SOURCES = ofontmenu.cc ofileselector.cc \
odevice.cpp otimepicker.cpp \
- otabwidget.cpp otabbar.cpp
+ otabwidget.cpp otabbar.cpp \
+ ofileselector/ofiledialog.cpp \
+ ofileselector/ofilelistview.cpp \
+ ofileselector/ofileselector.cpp \
+ ofileselector/ofileselectoritem.cpp \
+ ofileselector/ofileview.cpp \
+ ofileselector/olister.cpp \
+ ofileselector/olocallister.cpp \
+ ofileselector/ofileselectormain.cpp \
+ pim/opimrecord.cpp \
+ pim/otodo.cpp
TARGET = opie
diff --git a/libopie/ofileselector/ofileselector.cpp b/libopie/ofileselector/ofileselector.cpp
index 98b61f7..c52aa62 100644
--- a/libopie/ofileselector/ofileselector.cpp
+++ b/libopie/ofileselector/ofileselector.cpp
@@ -32,3 +32,5 @@
#include "ofileview.h"
+#include "ofileselectormain.h"
#include "ofileselector.h"
+#include "olocallister.h"
#include "olister.h"
@@ -103,19 +105,4 @@ void OFileSelector::setNewVisible( bool visible )
m_shNew = visible;
- if( m_selector == Normal ){
- delete m_select;
- // we need to initialize but keep the selected mimetype
- QString mime = currentMimeType();
- m_select = new FileSelector( mime ,
- m_stack, "fileselector",
- m_shNew, m_shClose);
-
- connect(m_select, SIGNAL(fileSelected( const DocLnk & ) ),
- this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) );
- connect(m_select, SIGNAL(closeMe() ),
- this, SIGNAL(closeMe() ) );
- //connect to close me and other signals as well
- m_stack->addWidget( m_select, Normal );
- }else{
- m_new->show();
- }
+ if (m_new )
+ m_new->show();
}
@@ -124,7 +111,5 @@ void OFileSelector::setCloseVisible( bool visible )
m_shClose = visible;
- if( m_selector == Normal ){
- setNewVisible( m_shNew ); // yeah baby
- }else{
+
+ if( m_close )
m_close->show();
- }
}
@@ -132,7 +117,6 @@ void OFileSelector::reread()
{
- if( m_selector == Normal ){
- setNewVisible( m_shNew ); // make it a initializeSelector
- }else {
- reparse();
- }
+ if( m_selector == Normal )
+ initializeOldSelector();
+ else
+ reparse();
}
@@ -149,2 +133,3 @@ void OFileSelector::setYesCancelVisible( bool show )
m_shYesNo = show;
+
if( m_shYesNo )
@@ -158,3 +143,2 @@ void OFileSelector::setToolbarVisible( bool show )
m_shTool = show;
- initializeListView(); // FIXME see above waste of memory
@@ -176,2 +160,3 @@ void OFileSelector::setPermissionBarVisible( bool show )
initializePerm();
+
if( m_shPerm )
@@ -187,5 +172,5 @@ void OFileSelector::setLineEditVisible( bool show )
}else{
- if( m_shLne && m_boxName != 0 ){ // check if we showed before this is the way to go
- m_boxName->hide();
- }
+ // check if we showed before this is the way to go
+ if( m_shLne && m_boxName != 0 )
+ m_boxName->hide();
}
@@ -198,7 +183,8 @@ void OFileSelector::setChooserVisible( bool show )
initializeChooser();
- if( m_shChooser ){
- m_boxView->hide();
- }else{
- m_boxView->show();
- }
+
+ if( m_shChooser )
+ m_boxView->hide();
+ else
+ m_boxView->show();
+
}
@@ -228,6 +214,7 @@ void OFileSelector::setMode(int mode) // FIXME do direct raising
}
-void OFileSelector::setShowDirs(bool )
+void OFileSelector::setShowDirs(bool dir)
{
- m_dir = true;
- reparse();
+ m_dir = dir;
+ if ( m_selector != Fileselector )
+ reparse();
}
@@ -236,3 +223,5 @@ void OFileSelector::setCaseSensetive(bool caSe )
m_case = caSe;
- reparse();
+
+ if ( m_selector != Fileselector )
+ reparse();
}
@@ -382,29 +371,14 @@ void OFileSelector::slotViewCheck(const QString &sel)
if( sel == tr("Documents" ) ){
- if( m_select == 0 ){
- // autMime? fix cause now we use All and not the current
- // yes currentMime fixes that for us
- QString mime = currentMimeType();
- m_select = new FileSelector(mime,
- m_stack, "fileselector",
- m_shNew, m_shClose);
- connect(m_select, SIGNAL(fileSelected( const DocLnk & ) ),
- this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) );
- connect(m_select, SIGNAL(closeMe() ),
- this, SIGNAL(closeMe() ) );
- //connect to close me and other signals as well
-
- m_stack->addWidget( m_select, Normal );
- }
- m_stack->raiseWidget( Normal );
- m_selector = Normal;
+ initializeOldSelector();
+ m_selector = Normal;
+
}else if( sel == tr("Files") ){
m_selector = Extended;
- initializeListView();
- reparse();
- m_stack->raiseWidget( Extended );
+
+ // FIXME call the factory
+ //reparse();
}else if( sel == tr("All Files") ){
m_selector = ExtendedAll;
- initializeListView();
- reparse();
- m_stack->raiseWidget( Extended ); // same widget other QFileFilter
+/* see above
+ reparse(); */
}
@@ -415,5 +389,6 @@ QString OFileSelector::currentMimeType() const{
QString currentText;
- if (m_shChooser )
+ if (m_shChooser && m_mimeCheck )
currentText = m_mimeCheck->currentText();
+ qWarning("CurrentText" + currentText );
if (tr("All") == currentText ) return QString::null;
@@ -424,3 +399,3 @@ QString OFileSelector::currentMimeType() const{
it = m_mimetypes.find( currentText );
- if ( it == m_mimetypes.end() ) {
+ if ( it != m_mimetypes.end() ) {
mime = it.data().join(";");
@@ -435,25 +410,4 @@ void OFileSelector::slotMimeCheck(const QString &mime)
if( m_selector == Normal ){
- //if( m_autoMime ){
- QString newMimeType;
- if (mime != tr("All") ) {
- QMap<QString, QStringList>::Iterator it;
- it = m_mimetypes.find(mime);
- if ( it != m_mimetypes.end() ) {
- newMimeType = it.data().join(";");
- }else{
- newMimeType = mime;
- }
- }
- delete m_select;
- m_select = new FileSelector( newMimeType,
- m_stack, "fileselector",
- m_shNew, m_shClose);
-
- connect(m_select, SIGNAL(fileSelected( const DocLnk & ) ),
- this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) );
- connect(m_select, SIGNAL(closeMe() ),
- this, SIGNAL(closeMe() ) );
- //connect to close me and other signals as well
- m_stack->addWidget( m_select, Normal );
- m_stack->raiseWidget( Normal );
+ initializeOldSelector();
+
updateMimes();
@@ -461,3 +415,2 @@ void OFileSelector::slotMimeCheck(const QString &mime)
m_mimeCheck->setCurrentItem(indexByString( m_mimeCheck, mime) );
- //}
}else{ // others
@@ -526,3 +479,7 @@ void OFileSelector::init()
- m_stack = new QWidgetStack( this );
+ /* take care of the main view... */
+ initToolbar();
+
+ /* initialize the file lister */
+ initLister();
if( m_selector == Normal ){
@@ -536,21 +493,6 @@ void OFileSelector::init()
}
- m_select = new FileSelector(mime,
- m_stack, "fileselector",
- m_shNew, m_shClose);
-
- connect(m_select, SIGNAL(fileSelected( const DocLnk & ) ),
- this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) );
- connect(m_select, SIGNAL(closeMe() ),
- this, SIGNAL( closeMe() ) );
- //connect to close me and other signals as well
-
- m_stack->addWidget( m_select, Normal );
- m_stack->raiseWidget( Normal );
- }else{ // we're in init so it will be EXTENDED or EXTENDED_ALL
- // and initializeListview will take care of those
- // toolbar get's generade in initializeListView
- initializeListView( ); // will raise the widget as well
- m_stack->raiseWidget( Extended );
+ initializeOldSelector();
+ }else{
+ initializeView();
}
- m_lay->addWidget( m_stack, 100 ); // add to the layout 10 = stretch
@@ -605,2 +547,5 @@ void OFileSelector::initVars()
m_showPopup = false;
+ m_mainView = 0l;
+ m_fileView = 0l;
+ m_lister = 0l;
@@ -625,3 +570,2 @@ void OFileSelector::initVars()
m_select = 0;
- m_stack = 0;
m_lay = 0;
@@ -632,3 +576,2 @@ void OFileSelector::initVars()
m_boxView = 0;
- m_custom = 0;
m_edit = 0;
@@ -716,2 +659,3 @@ void OFileSelector::initializeChooser()
/* update to custom views */
+
updateMimeCheck();
@@ -724,57 +668,82 @@ void OFileSelector::initializeChooser()
}
-void OFileSelector::initializeListView()
-{
- qWarning("initializeListView");
- if( m_pseudo == 0 ){
- qWarning("init");
- m_pseudo = new QWidget( m_stack, "Pseudo Widget");
+/* generate the buttons for the toolbar */
+void OFileSelector::initToolbar() {
+ m_mainView = new OFileSelectorMain( this );
+
+ /* now generate the tool bar */
+ qWarning( "toolbar" );
+ m_pseudo = new QWidget( m_mainView, "Pseudo Widget" );
m_pseudoLayout = new QVBoxLayout( m_pseudo );
- // toolbar
+
m_boxToolbar = new QHBox( m_pseudo );
- m_boxToolbar->setSpacing(0 ); // next to each other please
-
- // toolbar members
- {
- // location QComboBox
- m_location = new QComboBox( m_boxToolbar );
- m_location->setEditable( TRUE );
- m_location->setDuplicatesEnabled( FALSE );
- connect( m_location, SIGNAL(activated(const QString &) ),
- this, SLOT( slotLocationActivated(const QString &) ) );
- connect( m_location->lineEdit(), SIGNAL(returnPressed() ),
- this, SLOT(locationComboChanged() ) );
- // UP Button
- m_up = new QPushButton(Resource::loadIconSet("up"),"",
- m_boxToolbar,"cdUpButton");
- m_up->setFixedSize( QSize( 20, 20 ) );
- connect(m_up ,SIGNAL(clicked()),this,SLOT(cdUP() ) );
- m_up->setFlat(TRUE);
-
- // Home Button
- m_homeButton = new QPushButton(Resource::loadIconSet("home") ,
- "", m_boxToolbar);
- m_homeButton->setFixedSize( QSize( 20, 20 ) );
- connect(m_homeButton,SIGNAL(clicked()),this,SLOT(slotHome() ) );
- m_homeButton->setFlat(TRUE);
- // Documents Button
- m_docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",
- m_boxToolbar,"docsButton");
- m_docButton->setFixedSize( QSize( 20, 20 ) );
- connect(m_homeButton,SIGNAL(clicked()),this,SLOT(slotDoc() ) );
- m_docButton->setFlat(TRUE);
-
- // Close button
- m_close = new QPushButton( Resource::loadIconSet( "close"), "",
- m_boxToolbar );
- connect( m_close, SIGNAL(clicked() ), this, SIGNAL(closeMe() ) );
- m_close->setFixedSize( 20, 20 );
-
- m_boxToolbar->setFixedHeight( 20 );
- m_pseudoLayout->addWidget(m_boxToolbar );
-
- // let;s fill the Location ComboBox
- StorageInfo storage;
- const QList<FileSystem> &fs = storage.fileSystems();
- QListIterator<FileSystem> it ( fs );
- for( ; it.current(); ++it ){
+ m_boxToolbar->setSpacing( 0 );
+
+ // tool bar members now
+ m_location = new QComboBox( m_boxToolbar );
+ m_location->setEditable( TRUE );
+ m_location->setDuplicatesEnabled( FALSE );
+ connect( m_location, SIGNAL(activated(const QString& ) ),
+ this, SLOT(slotLocationActivated(const QString& )) );
+ connect( m_location->lineEdit(), SIGNAL(returnPressed() ) ,
+ this, SLOT(locationComboChanged() ) );
+
+ // UP Button
+ m_up = new QPushButton( Resource::loadIconSet("up"), QString::null,
+ m_boxToolbar, "cdUpButton" );
+ m_up->setFixedSize( QSize(20, 20 ) );
+ connect( m_up, SIGNAL( clicked() ), this, SLOT(cdUP() ) );
+ m_up->setFlat( TRUE );
+
+ // Home Button
+ m_homeButton = new QPushButton(Resource::loadIconSet("home"),
+ QString::null, m_boxToolbar );
+ m_homeButton->setFixedSize( QSize(20, 20 ) );
+ connect(m_homeButton, SIGNAL(clicked() ), this, SLOT(slotHome() ) );
+ m_homeButton->setFlat( TRUE );
+
+ // Documents Button
+ m_docButton = new QPushButton( Resource::loadIconSet("DocsIcon"),
+ QString::null, m_boxToolbar,
+ "docsButton" );
+ m_docButton->setFixedSize( QSize(20, 20 ) );
+ m_docButton->setFlat( true );
+ connect( m_docButton, SIGNAL(clicked() ),
+ this, SLOT(slotDoc() ) );
+
+ // close button
+ m_close = new QPushButton( Resource::loadIconSet( "close"), "",
+ m_boxToolbar );
+ connect( m_close, SIGNAL(clicked() ), this, SIGNAL(closeMe() ) );
+ m_close->setFixedSize( 20, 20 );
+
+ m_boxToolbar->setFixedHeight( 20 );
+ m_pseudoLayout->addWidget(m_boxToolbar );
+
+ /* init the locations */
+ initLocations();
+
+ if( !m_shTool ){
+ m_location->hide( );
+ m_up->hide( );
+ m_homeButton->hide( );
+ m_docButton->hide( );
+ }
+ if(!m_shClose )
+ m_close->hide();
+
+ m_mainView->setToolbar( m_pseudo );
+ m_lay->addWidget( m_mainView, 100 );
+}
+/* initialize the OLocalLister */
+void OFileSelector::initLister() {
+ m_lister = new OLocalLister(this);
+}
+/* put default locations into the bar */
+void OFileSelector::initLocations () {
+
+ // let;s fill the Location ComboBox
+ StorageInfo storage;
+ const QList<FileSystem> &fs = storage.fileSystems();
+ QListIterator<FileSystem> it ( fs );
+ for( ; it.current(); ++it ){
const QString disk = (*it)->name();
@@ -782,25 +751,7 @@ void OFileSelector::initializeListView()
m_location->insertItem(path+ "<-"+disk );
- }
- int count = m_location->count();
- m_location->insertItem( m_currentDir );
- m_location->setCurrentItem( count );
- // due to the New and Close button we can not simply hide m_boxToolBar to not show it
- if( !m_shTool ){
- m_location->hide( );
- m_up->hide( );
- m_homeButton->hide( );
- m_docButton->hide( );
- }
- if(!m_shClose )
- m_close->hide();
- //if(!m_shNew)
- //m_close->hide();
-
- } // off toolbar
- // the Main ListView
- // make a QWidgetStack first so Views can share the Toolbar
+ }
+ int count = m_location->count();
+ m_location->insertItem( m_currentDir );
+ m_location->setCurrentItem( count );
- // m_pseudoLayout->addWidget( m_View, 288 );
- m_stack->addWidget( m_pseudo, Extended );
- }
}
@@ -1004,6 +955,6 @@ void OFileSelector::reparse()
OFileView* OFileSelector::currentView() {
- return 0l;
+ return m_fileView;
}
OFileView* OFileSelector::currentView() const{
- return 0l;
+ return m_fileView;
}
@@ -1049,3 +1000,23 @@ QPixmap OFileSelector::pixmap( const QString& s ) {
OLister* OFileSelector::currentLister()const {
- return 0l;
+ return m_lister;
+}
+void OFileSelector::initializeOldSelector() {
+ qWarning("initializeOldSelector");
+
+ delete m_select;
+
+ // we need to initialize but keep the selected mimetype
+ /* we default not to show close and new buttons */
+ QString mime = currentMimeType();
+ qWarning("MimeType " + mime );
+ m_select = new FileSelector( mime ,
+ m_mainView, "fileselector",
+ FALSE, FALSE);
+
+ connect(m_select, SIGNAL(fileSelected( const DocLnk & ) ),
+ this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) );
+ connect(m_select, SIGNAL(closeMe() ),
+ this, SIGNAL(closeMe() ) );
+ //connect to close me and other signals as well
+ m_mainView->setWidget( m_select );
}
diff --git a/libopie/ofileselector/ofileselector.h b/libopie/ofileselector/ofileselector.h
index a7b363f..bf9a26b 100644
--- a/libopie/ofileselector/ofileselector.h
+++ b/libopie/ofileselector/ofileselector.h
@@ -71,2 +71,3 @@ class OFileView;
class OLister;
+class OFileSelectorMain;
//
@@ -110,3 +111,3 @@ class OFileSelector : public QWidget {
*/
- enum Selector{Normal=0, Extended = 1, ExtendedAll =2 };
+ enum Selector{Normal=0, Extended = 1, ExtendedAll = 2};
@@ -344,2 +345,4 @@ class OFileSelector : public QWidget {
QPixmap pixmap( const QString& );
+ /* our tool bar */
+ QWidget* toolBar();
@@ -371,2 +374,5 @@ class OFileSelector : public QWidget {
+ OFileSelectorMain* m_mainView;
+ OLister* m_lister;
+ OFileView* m_fileView;
FileSelector* m_select;
@@ -392,45 +398,43 @@ class OFileSelector : public QWidget {
QString m_name;
- QMap<QString, QStringList> m_mimetypes;
-
-
- QWidgetStack *m_stack;
- QVBoxLayout *m_lay;
- QGridLayout *m_Oselector;
-
- QHBox *m_boxToolbar;
- QHBox *m_boxOk;
- QHBox *m_boxName;
- QHBox *m_boxView;
-
- QPopupMenu *m_custom;
-
- QLineEdit *m_edit;
- QLabel *m_fnLabel;
-
- bool m_shClose : 1;
- bool m_shNew : 1;
- bool m_shTool : 1;
- bool m_shPerm : 1;
- bool m_shLne : 1;
- bool m_shChooser : 1;
- bool m_shYesNo : 1;
- bool m_boCheckPerm : 1;
- bool m_autoMime : 1;
- bool m_case : 1;
- bool m_dir : 1;
- bool m_files : 1;
- bool m_showPopup : 1;
-
- void initVars();
-
- void delItems();
- void initializeName();
- void initializeYes();
- void initializeChooser();
- void initializeListView();
- void initializePerm();
- void initPics();
- bool compliesMime(const QString &path,
- const QString &mime);
- bool compliesMime(const QString& mime );
+
+ QMap<QString, QStringList> m_mimetypes;
+
+ QVBoxLayout *m_lay;
+ QGridLayout *m_Oselector;
+
+ QHBox *m_boxToolbar;
+ QHBox *m_boxOk;
+ QHBox *m_boxName;
+ QHBox *m_boxView;
+
+
+ QLineEdit *m_edit;
+ QLabel *m_fnLabel;
+
+ bool m_shClose : 1;
+ bool m_shNew : 1;
+ bool m_shTool : 1;
+ bool m_shPerm : 1;
+ bool m_shLne : 1;
+ bool m_shChooser : 1;
+ bool m_shYesNo : 1;
+ bool m_boCheckPerm : 1;
+ bool m_autoMime : 1;
+ bool m_case : 1;
+ bool m_dir : 1;
+ bool m_files : 1;
+ bool m_showPopup : 1;
+ bool m_showHidden : 1;
+
+ void initVars();
+
+ void delItems();
+ void initializeName();
+ void initializeYes();
+ void initializeChooser();
+ void initializePerm();
+ void initPics();
+ bool compliesMime(const QString &path,
+ const QString &mime);
+ bool compliesMime(const QString& mime );
/**
@@ -438,4 +442,9 @@ class OFileSelector : public QWidget {
*/
- void updateMimeCheck();
+ void updateMimeCheck();
+ void initializeOldSelector();
+ void initLister();
+ void initToolbar();
+ void initLocations();
+ void initializeView() {}; // FIXME
/**
@@ -443,17 +452,17 @@ class OFileSelector : public QWidget {
*/
- QString currentMimeType()const;
- class OFileSelectorPrivate;
- OFileSelectorPrivate *d;
- static QMap<QString,QPixmap> *m_pixmaps;
+ QString currentMimeType()const;
+ class OFileSelectorPrivate;
+ OFileSelectorPrivate *d;
+ static QMap<QString,QPixmap> *m_pixmaps;
private slots:
- void slotFileSelected(const QString & ); // not really meant to be a slot
- void slotFileBridgeSelected( const DocLnk & );
- // listview above
- // popup below
- virtual void slotDelete();
- virtual void cdUP();
- virtual void slotHome();
- virtual void slotDoc();
- virtual void slotNavigate( );
+ void slotFileSelected(const QString & ); // not really meant to be a slot
+ void slotFileBridgeSelected( const DocLnk & );
+ // listview above
+ // popup below
+ virtual void slotDelete();
+ virtual void cdUP();
+ virtual void slotHome();
+ virtual void slotDoc();
+ virtual void slotNavigate( );
diff --git a/libopie/ofileselector/olister.h b/libopie/ofileselector/olister.h
index 081b876..ef61cab 100644
--- a/libopie/ofileselector/olister.h
+++ b/libopie/ofileselector/olister.h
@@ -6,2 +6,3 @@
#include <qstring.h>
+#include <qstringlist.h>
diff --git a/libopie/pim/opimrecord.cpp b/libopie/pim/opimrecord.cpp
index 95de1df..d8f73c7 100644
--- a/libopie/pim/opimrecord.cpp
+++ b/libopie/pim/opimrecord.cpp
@@ -4,3 +4,5 @@ OPimRecord::OPimRecord( int uid )
: Qtopia::Record() {
+
setUid( uid );
+ /* assign a new UID */
if ( uid == 1 )
@@ -10,3 +12,3 @@ OPimRecord::~OPimRecord() {
}
-OPimRecord::OPimRecord( OPimRecord& rec )
+OPimRecord::OPimRecord( const OPimRecord& rec )
: Qtopia::Record( rec )
@@ -17,5 +19,5 @@ OPimRecord::OPimRecord( OPimRecord& rec )
OPimRecord &OPimRecord::operator=( const OPimRecord& rec) {
- /* how do I call the parent copy operator ? */
- setUid( rec.uid() );
- setCategories( rec.categories() );
+ Qtopia::Record::operator=( rec );
+ m_relations = rec.m_relations;
+
return *this;
@@ -27,3 +29,3 @@ QStringList OPimRecord::categoryNames()const {
}
-void OPimRecord::setCategoryName( const QStringList& ) {
+void OPimRecord::setCategoryNames( const QStringList& ) {
@@ -90 +92,15 @@ void OPimRecord::setRelations( const QString& app, QArray<int> ids ) {
}
+QString OPimRecord::crossToString()const {
+ QString str;
+ QMap<QString, QArray<int> >::ConstIterator it;
+ for (it = m_relations.begin(); it != m_relations.end(); ++it ) {
+ QArray<int> id = it.data();
+ for ( uint i = 0; i < id.size(); ++i ) {
+ str += it.key() + "," + QString::number( i ) + ";";
+ }
+ }
+ str = str.remove( str.length()-1, 1); // strip the ;
+ //qWarning("IDS " + str );
+
+ return str;
+}
diff --git a/libopie/pim/opimrecord.h b/libopie/pim/opimrecord.h
index a0e0413..18112d4 100644
--- a/libopie/pim/opimrecord.h
+++ b/libopie/pim/opimrecord.h
@@ -21,3 +21,3 @@ public:
*/
- OPimRecord( OPimRecord& rec );
+ OPimRecord( const OPimRecord& rec );
@@ -36,3 +36,3 @@ public:
*/
- void setCategoryName( const QStringList& );
+ void setCategoryNames( const QStringList& );
diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp
index d8e0447..3c93838 100644
--- a/libopie/pim/otodo.cpp
+++ b/libopie/pim/otodo.cpp
@@ -13,10 +13,9 @@
-#include "todoevent.h"
-using namespace Opie;
-Qtopia::UidGen ToDoEvent::m_gen;
+#include "otodo.h"
-struct ToDoEvent::ToDoEventData : public QShared {
- ToDoEventData() : QShared() {
+
+struct OTodo::OTodoData : public QShared {
+ OTodoData() : QShared() {
};
@@ -31,4 +30,2 @@ struct ToDoEvent::ToDoEventData : public QShared {
QMap<QString, QString> extra;
- QMap<QString, QArray<int> > relations;
- int uid;
ushort prog;
@@ -38,4 +35,4 @@ struct ToDoEvent::ToDoEventData : public QShared {
-ToDoEvent::ToDoEvent(const ToDoEvent &event )
- : data( event.data )
+OTodo::OTodo(const OTodo &event )
+ : OPimRecord( event ), data( event.data )
{
@@ -44,5 +41,5 @@ ToDoEvent::ToDoEvent(const ToDoEvent &event )
}
-ToDoEvent::~ToDoEvent() {
+OTodo::~OTodo() {
if ( data->deref() ) {
- //qWarning("ToDoEvent::dereffing");
+ //qWarning("OTodo::dereffing");
delete data;
@@ -52,3 +49,3 @@ ToDoEvent::~ToDoEvent() {
-ToDoEvent::ToDoEvent(bool completed, int priority,
+OTodo::OTodo(bool completed, int priority,
const QStringList &category,
@@ -58,5 +55,7 @@ ToDoEvent::ToDoEvent(bool completed, int priority,
bool hasDate, QDate date, int uid )
+ : OPimRecord( uid )
{
- //qWarning("ToDoEventData");
- data = new ToDoEventData;
+ //qWarning("OTodoData");
+ setCategories( idsFromString( category.join(";") ) );
+ data = new OTodoData;
data->date = date;
@@ -65,3 +64,2 @@ ToDoEvent::ToDoEvent(bool completed, int priority,
data->priority = priority;
- data->category = category;
data->sum = summary;
@@ -69,9 +67,2 @@ ToDoEvent::ToDoEvent(bool completed, int priority,
data->desc = Qtopia::simplifyMultiLineSpace(description );
- if (uid == -1 ) {
- uid = m_gen.generate();
-
- }// generated the ids
- m_gen.store( uid );
-
- data->uid = uid;
data->hasAlarmDateTime = false;
@@ -79,10 +70,3 @@ ToDoEvent::ToDoEvent(bool completed, int priority,
}
-QArray<int> ToDoEvent::categories()const
-{
- qWarning( "ToDoEvent:cats" + data->category.join(";") );
- QArray<int> array(data->category.count() ); // currently the datebook can be only in one category
- array = Qtopia::Record::idsFromString( data->category.join(";") );
- return array;
-}
-bool ToDoEvent::match( const QRegExp &regExp )const
+bool OTodo::match( const QRegExp &regExp )const
{
@@ -94,2 +78,4 @@ bool ToDoEvent::match( const QRegExp &regExp )const
return true;
+ }else if(data->sum.find( regExp ) != -1 ) {
+ return true;
}
@@ -97,3 +83,3 @@ bool ToDoEvent::match( const QRegExp &regExp )const
}
-bool ToDoEvent::isCompleted() const
+bool OTodo::isCompleted() const
{
@@ -101,3 +87,3 @@ bool ToDoEvent::isCompleted() const
}
-bool ToDoEvent::hasDueDate() const
+bool OTodo::hasDueDate() const
{
@@ -105,3 +91,3 @@ bool ToDoEvent::hasDueDate() const
}
-bool ToDoEvent::hasAlarmDateTime() const
+bool OTodo::hasAlarmDateTime() const
{
@@ -109,3 +95,3 @@ bool ToDoEvent::hasAlarmDateTime() const
}
-int ToDoEvent::priority()const
+int OTodo::priority()const
{
@@ -113,11 +99,3 @@ int ToDoEvent::priority()const
}
-QStringList ToDoEvent::allCategories()const
-{
- return data->category;
-}
-QString ToDoEvent::extra(const QString& )const
-{
- return QString::null;
-}
-QString ToDoEvent::summary() const
+QString OTodo::summary() const
{
@@ -125,3 +103,3 @@ QString ToDoEvent::summary() const
}
-ushort ToDoEvent::progress() const
+ushort OTodo::progress() const
{
@@ -129,38 +107,3 @@ ushort ToDoEvent::progress() const
}
-QStringList ToDoEvent::relatedApps() const
-{
- QStringList list;
- QMap<QString, QArray<int> >::ConstIterator it;
- for ( it = data->relations.begin(); it != data->relations.end(); ++it ) {
- list << it.key();
- }
- return list;
-}
-QArray<int> ToDoEvent::relations( const QString& app)const
-{
- QArray<int> tmp;
- QMap<QString, QArray<int> >::ConstIterator it;
- it = data->relations.find( app);
- if ( it != data->relations.end() )
- tmp = it.data();
- return tmp;
-}
-void ToDoEvent::insertCategory(const QString &str )
-{
- changeOrModify();
- qWarning("insert category;" + str );
- data->category.append( str );
-}
-void ToDoEvent::clearCategories()
-{
- changeOrModify();
- data->category.clear();
-}
-void ToDoEvent::setCategories(const QStringList &list )
-{
- changeOrModify();
- qWarning("set categories" + list.join(";") );
- data->category = list;
-}
-QDate ToDoEvent::dueDate()const
+QDate OTodo::dueDate()const
{
@@ -169,3 +112,3 @@ QDate ToDoEvent::dueDate()const
-QDateTime ToDoEvent::alarmDateTime() const
+QDateTime OTodo::alarmDateTime() const
{
@@ -174,3 +117,3 @@ QDateTime ToDoEvent::alarmDateTime() const
-QString ToDoEvent::description()const
+QString OTodo::description()const
{
@@ -178,3 +121,3 @@ QString ToDoEvent::description()const
}
-void ToDoEvent::setCompleted( bool completed )
+void OTodo::setCompleted( bool completed )
{
@@ -183,3 +126,3 @@ void ToDoEvent::setCompleted( bool completed )
}
-void ToDoEvent::setHasDueDate( bool hasDate )
+void OTodo::setHasDueDate( bool hasDate )
{
@@ -188,3 +131,3 @@ void ToDoEvent::setHasDueDate( bool hasDate )
}
-void ToDoEvent::setHasAlarmDateTime( bool hasAlarmDateTime )
+void OTodo::setHasAlarmDateTime( bool hasAlarmDateTime )
{
@@ -193,3 +136,3 @@ void ToDoEvent::setHasAlarmDateTime( bool hasAlarmDateTime )
}
-void ToDoEvent::setDescription(const QString &desc )
+void OTodo::setDescription(const QString &desc )
{
@@ -198,7 +141,3 @@ void ToDoEvent::setDescription(const QString &desc )
}
-void ToDoEvent::setExtra( const QString&, const QString& )
-{
-
-}
-void ToDoEvent::setSummary( const QString& sum )
+void OTodo::setSummary( const QString& sum )
{
@@ -207,10 +146,3 @@ void ToDoEvent::setSummary( const QString& sum )
}
-void ToDoEvent::setCategory( const QString &cat )
-{
- changeOrModify();
- //qWarning("setCategory %s", cat.latin1() );
- data->category.clear();
- data->category << cat;
-}
-void ToDoEvent::setPriority(int prio )
+void OTodo::setPriority(int prio )
{
@@ -219,3 +151,3 @@ void ToDoEvent::setPriority(int prio )
}
-void ToDoEvent::setDueDate( QDate date )
+void OTodo::setDueDate( QDate date )
{
@@ -224,3 +156,3 @@ void ToDoEvent::setDueDate( QDate date )
}
-void ToDoEvent::setAlarmDateTime( const QDateTime& alarm )
+void OTodo::setAlarmDateTime( const QDateTime& alarm )
{
@@ -229,47 +161,3 @@ void ToDoEvent::setAlarmDateTime( const QDateTime& alarm )
}
-void ToDoEvent::addRelated( const QString &app, int id )
-{
- changeOrModify();
-
- QMap<QString, QArray<int> >::Iterator it;
- QArray<int> tmp;
- it = data->relations.find( app );
- if ( it == data->relations.end() ) {
- tmp.resize(1 );
- tmp[0] = id;
- }else{
- tmp = it.data();
- tmp.resize( tmp.size() + 1 );
- tmp[tmp.size() - 1] = id;
- }
- data->relations.replace( app, tmp );
-}
-void ToDoEvent::addRelated(const QString& app, QArray<int> ids )
-{
- changeOrModify();
-
- QMap<QString, QArray<int> >::Iterator it;
- QArray<int> tmp;
- it = data->relations.find( app);
- if ( it == data->relations.end() ) { // not there
- /** tmp.resize( ids.size() ); stupid??
- */
- tmp = ids;
- }else{
- tmp = it.data();
- int offset = tmp.size()-1;
- tmp.resize( tmp.size() + ids.size() );
- for (uint i = 0; i < ids.size(); i++ ) {
- tmp[offset+i] = ids[i];
- }
-
- }
- data->relations.replace( app, tmp );
-}
-void ToDoEvent::clearRelated( const QString& app )
-{
- changeOrModify();
- data->relations.remove( app );
-}
-bool ToDoEvent::isOverdue( )
+bool OTodo::isOverdue( )
{
@@ -279,3 +167,3 @@ bool ToDoEvent::isOverdue( )
}
-void ToDoEvent::setProgress(ushort progress )
+void OTodo::setProgress(ushort progress )
{
@@ -284,2 +172,5 @@ void ToDoEvent::setProgress(ushort progress )
}
+QString OTodo::toShortText() const {
+ return summary();
+}
/*!
@@ -287,3 +178,3 @@ void ToDoEvent::setProgress(ushort progress )
*/
-QString ToDoEvent::richText() const
+QString OTodo::toRichText() const
{
@@ -318,20 +209,6 @@ QString ToDoEvent::richText() const
- // Open database of all categories and get the list of
- // the categories this todoevent belongs to.
- // Then print them...
- // I am not sure whether there is no better way doing this !?
- Categories catdb;
- bool firstloop = true;
- catdb.load( categoryFileName() );
- catlist = allCategories();
-
text += "<b>" + QObject::tr( "Category:") + "</b> ";
- for ( QStringList::Iterator it = catlist.begin(); it != catlist.end(); ++it ) {
- if (!firstloop){
- text += ", ";
- }
- firstloop = false;
- text += catdb.label ("todo", (*it).toInt());
- }
+ text += categoryNames().join(", ");
text += "<br>";
+
return text;
@@ -339,3 +216,3 @@ QString ToDoEvent::richText() const
-bool ToDoEvent::operator<( const ToDoEvent &toDoEvent )const{
+bool OTodo::operator<( const OTodo &toDoEvent )const{
if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true;
@@ -351,3 +228,3 @@ bool ToDoEvent::operator<( const ToDoEvent &toDoEvent )const{
}
-bool ToDoEvent::operator<=(const ToDoEvent &toDoEvent )const
+bool OTodo::operator<=(const OTodo &toDoEvent )const
{
@@ -364,3 +241,3 @@ bool ToDoEvent::operator<=(const ToDoEvent &toDoEvent )const
}
-bool ToDoEvent::operator>(const ToDoEvent &toDoEvent )const
+bool OTodo::operator>(const OTodo &toDoEvent )const
{
@@ -377,3 +254,3 @@ bool ToDoEvent::operator>(const ToDoEvent &toDoEvent )const
}
-bool ToDoEvent::operator>=(const ToDoEvent &toDoEvent )const
+bool OTodo::operator>=(const OTodo &toDoEvent )const
{
@@ -390,3 +267,3 @@ bool ToDoEvent::operator>=(const ToDoEvent &toDoEvent )const
}
-bool ToDoEvent::operator==(const ToDoEvent &toDoEvent )const
+bool OTodo::operator==(const OTodo &toDoEvent )const
{
@@ -406,3 +283,3 @@ bool ToDoEvent::operator==(const ToDoEvent &toDoEvent )const
}
-void ToDoEvent::deref() {
+void OTodo::deref() {
@@ -415,4 +292,5 @@ void ToDoEvent::deref() {
}
-ToDoEvent &ToDoEvent::operator=(const ToDoEvent &item )
+OTodo &OTodo::operator=(const OTodo &item )
{
+ OPimRecord::operator=( item );
//qWarning("operator= ref ");
@@ -421,5 +299,2 @@ ToDoEvent &ToDoEvent::operator=(const ToDoEvent &item )
- data = item.data;
-
-
return *this;
@@ -427,7 +302,7 @@ ToDoEvent &ToDoEvent::operator=(const ToDoEvent &item )
-QMap<int, QString> ToDoEvent::toMap() const {
+QMap<int, QString> OTodo::toMap() const {
QMap<int, QString> map;
- map.insert( Uid, QString::number( data->uid ) );
- map.insert( Category, data->category.join(";") );
+ map.insert( Uid, QString::number( uid() ) );
+ map.insert( Category, idsToString( categories() ) );
map.insert( HasDate, QString::number( data->hasDate ) );
@@ -448,28 +323,3 @@ QMap<int, QString> ToDoEvent::toMap() const {
-
-QString ToDoEvent::crossToString()const {
- QString str;
- QMap<QString, QArray<int> >::ConstIterator it;
- for (it = data->relations.begin(); it != data->relations.end(); ++it ) {
- QArray<int> id = it.data();
- for ( uint i = 0; i < id.size(); ++i ) {
- str += it.key() + "," + QString::number( i ) + ";";
- }
- }
- str = str.remove( str.length()-1, 1); // strip the ;
- //qWarning("IDS " + str );
-
- return str;
-}
-int ToDoEvent::uid()const {
- return data->uid;
-}
-void ToDoEvent::setUid( int id ) {
- if ( id == -1 )
- id = m_gen.generate();
- m_gen.store(id );
- changeOrModify();
- data->uid = id;
-}
-QMap<QString, QString> ToDoEvent::extras()const {
+QMap<QString, QString> OTodo::toExtraMap()const {
return data->extra;
@@ -481,3 +331,3 @@ QMap<QString, QString> ToDoEvent::extras()const {
*/
-void ToDoEvent::changeOrModify() {
+void OTodo::changeOrModify() {
if ( data->count != 1 ) {
@@ -485,3 +335,3 @@ void ToDoEvent::changeOrModify() {
data->deref();
- ToDoEventData* d2 = new ToDoEventData();
+ OTodoData* d2 = new OTodoData();
copy(data, d2 );
@@ -490,3 +340,3 @@ void ToDoEvent::changeOrModify() {
}
-void ToDoEvent::copy( ToDoEventData* src, ToDoEventData* dest ) {
+void OTodo::copy( OTodoData* src, OTodoData* dest ) {
dest->date = src->date;
@@ -495,3 +345,2 @@ void ToDoEvent::copy( ToDoEventData* src, ToDoEventData* dest ) {
dest->priority = src->priority;
- dest->category = src->category;
dest->desc = src->desc;
@@ -499,4 +348,2 @@ void ToDoEvent::copy( ToDoEventData* src, ToDoEventData* dest ) {
dest->extra = src->extra;
- dest->relations = src->relations;
- dest->uid = src->uid;
dest->prog = src->prog;
diff --git a/libopie/pim/otodo.h b/libopie/pim/otodo.h
index 429108a..e1729db 100644
--- a/libopie/pim/otodo.h
+++ b/libopie/pim/otodo.h
@@ -20,3 +20,3 @@ class OTodo : public OPimRecord {
public:
- typedef QValueList<ToDoEvent> ValueList;
+ typedef QValueList<OTodo> ValueList;
enum RecordFields {
@@ -120,2 +120,9 @@ public:
+ /**
+ * reimplementation
+ */
+ QString type()const;
+ QString toShortText()const;
+ QMap<QString, QString> toExtraMap()const;
+ QString recordField(int id )const;
@@ -185,3 +192,3 @@ public:
bool operator==(const OTodo &toDoEvent )const;
- ToDoEvent &operator=(const OTodo &toDoEvent );
+ OTodo &operator=(const OTodo &toDoEvent );
@@ -189,3 +196,3 @@ public:
class OTodoPrivate;
- struct OTodoEventData;
+ struct OTodoData;
@@ -194,11 +201,10 @@ public:
void copy( OTodoData* src, OTodoData* dest );
- ToDoEventPrivate *d;
- ToDoEventData *data;
+ OTodoPrivate *d;
+ OTodoData *data;
- static Qtopia::UidGen m_gen;
-};
- inline bool ToDoEvent::operator!=(const ToDoEvent &toDoEvent )const {
- return !(*this == toDoEvent);
- }
};
+inline bool OTodo::operator!=(const OTodo &toDoEvent )const {
+ return !(*this == toDoEvent);
+}
+
diff --git a/libopie2/opiepim/core/opimrecord.cpp b/libopie2/opiepim/core/opimrecord.cpp
index 95de1df..d8f73c7 100644
--- a/libopie2/opiepim/core/opimrecord.cpp
+++ b/libopie2/opiepim/core/opimrecord.cpp
@@ -4,3 +4,5 @@ OPimRecord::OPimRecord( int uid )
: Qtopia::Record() {
+
setUid( uid );
+ /* assign a new UID */
if ( uid == 1 )
@@ -10,3 +12,3 @@ OPimRecord::~OPimRecord() {
}
-OPimRecord::OPimRecord( OPimRecord& rec )
+OPimRecord::OPimRecord( const OPimRecord& rec )
: Qtopia::Record( rec )
@@ -17,5 +19,5 @@ OPimRecord::OPimRecord( OPimRecord& rec )
OPimRecord &OPimRecord::operator=( const OPimRecord& rec) {
- /* how do I call the parent copy operator ? */
- setUid( rec.uid() );
- setCategories( rec.categories() );
+ Qtopia::Record::operator=( rec );
+ m_relations = rec.m_relations;
+
return *this;
@@ -27,3 +29,3 @@ QStringList OPimRecord::categoryNames()const {
}
-void OPimRecord::setCategoryName( const QStringList& ) {
+void OPimRecord::setCategoryNames( const QStringList& ) {
@@ -90 +92,15 @@ void OPimRecord::setRelations( const QString& app, QArray<int> ids ) {
}
+QString OPimRecord::crossToString()const {
+ QString str;
+ QMap<QString, QArray<int> >::ConstIterator it;
+ for (it = m_relations.begin(); it != m_relations.end(); ++it ) {
+ QArray<int> id = it.data();
+ for ( uint i = 0; i < id.size(); ++i ) {
+ str += it.key() + "," + QString::number( i ) + ";";
+ }
+ }
+ str = str.remove( str.length()-1, 1); // strip the ;
+ //qWarning("IDS " + str );
+
+ return str;
+}
diff --git a/libopie2/opiepim/core/opimrecord.h b/libopie2/opiepim/core/opimrecord.h
index a0e0413..18112d4 100644
--- a/libopie2/opiepim/core/opimrecord.h
+++ b/libopie2/opiepim/core/opimrecord.h
@@ -21,3 +21,3 @@ public:
*/
- OPimRecord( OPimRecord& rec );
+ OPimRecord( const OPimRecord& rec );
@@ -36,3 +36,3 @@ public:
*/
- void setCategoryName( const QStringList& );
+ void setCategoryNames( const QStringList& );
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp
index d8e0447..3c93838 100644
--- a/libopie2/opiepim/otodo.cpp
+++ b/libopie2/opiepim/otodo.cpp
@@ -13,10 +13,9 @@
-#include "todoevent.h"
-using namespace Opie;
-Qtopia::UidGen ToDoEvent::m_gen;
+#include "otodo.h"
-struct ToDoEvent::ToDoEventData : public QShared {
- ToDoEventData() : QShared() {
+
+struct OTodo::OTodoData : public QShared {
+ OTodoData() : QShared() {
};
@@ -31,4 +30,2 @@ struct ToDoEvent::ToDoEventData : public QShared {
QMap<QString, QString> extra;
- QMap<QString, QArray<int> > relations;
- int uid;
ushort prog;
@@ -38,4 +35,4 @@ struct ToDoEvent::ToDoEventData : public QShared {
-ToDoEvent::ToDoEvent(const ToDoEvent &event )
- : data( event.data )
+OTodo::OTodo(const OTodo &event )
+ : OPimRecord( event ), data( event.data )
{
@@ -44,5 +41,5 @@ ToDoEvent::ToDoEvent(const ToDoEvent &event )
}
-ToDoEvent::~ToDoEvent() {
+OTodo::~OTodo() {
if ( data->deref() ) {
- //qWarning("ToDoEvent::dereffing");
+ //qWarning("OTodo::dereffing");
delete data;
@@ -52,3 +49,3 @@ ToDoEvent::~ToDoEvent() {
-ToDoEvent::ToDoEvent(bool completed, int priority,
+OTodo::OTodo(bool completed, int priority,
const QStringList &category,
@@ -58,5 +55,7 @@ ToDoEvent::ToDoEvent(bool completed, int priority,
bool hasDate, QDate date, int uid )
+ : OPimRecord( uid )
{
- //qWarning("ToDoEventData");
- data = new ToDoEventData;
+ //qWarning("OTodoData");
+ setCategories( idsFromString( category.join(";") ) );
+ data = new OTodoData;
data->date = date;
@@ -65,3 +64,2 @@ ToDoEvent::ToDoEvent(bool completed, int priority,
data->priority = priority;
- data->category = category;
data->sum = summary;
@@ -69,9 +67,2 @@ ToDoEvent::ToDoEvent(bool completed, int priority,
data->desc = Qtopia::simplifyMultiLineSpace(description );
- if (uid == -1 ) {
- uid = m_gen.generate();
-
- }// generated the ids
- m_gen.store( uid );
-
- data->uid = uid;
data->hasAlarmDateTime = false;
@@ -79,10 +70,3 @@ ToDoEvent::ToDoEvent(bool completed, int priority,
}
-QArray<int> ToDoEvent::categories()const
-{
- qWarning( "ToDoEvent:cats" + data->category.join(";") );
- QArray<int> array(data->category.count() ); // currently the datebook can be only in one category
- array = Qtopia::Record::idsFromString( data->category.join(";") );
- return array;
-}
-bool ToDoEvent::match( const QRegExp &regExp )const
+bool OTodo::match( const QRegExp &regExp )const
{
@@ -94,2 +78,4 @@ bool ToDoEvent::match( const QRegExp &regExp )const
return true;
+ }else if(data->sum.find( regExp ) != -1 ) {
+ return true;
}
@@ -97,3 +83,3 @@ bool ToDoEvent::match( const QRegExp &regExp )const
}
-bool ToDoEvent::isCompleted() const
+bool OTodo::isCompleted() const
{
@@ -101,3 +87,3 @@ bool ToDoEvent::isCompleted() const
}
-bool ToDoEvent::hasDueDate() const
+bool OTodo::hasDueDate() const
{
@@ -105,3 +91,3 @@ bool ToDoEvent::hasDueDate() const
}
-bool ToDoEvent::hasAlarmDateTime() const
+bool OTodo::hasAlarmDateTime() const
{
@@ -109,3 +95,3 @@ bool ToDoEvent::hasAlarmDateTime() const
}
-int ToDoEvent::priority()const
+int OTodo::priority()const
{
@@ -113,11 +99,3 @@ int ToDoEvent::priority()const
}
-QStringList ToDoEvent::allCategories()const
-{
- return data->category;
-}
-QString ToDoEvent::extra(const QString& )const
-{
- return QString::null;
-}
-QString ToDoEvent::summary() const
+QString OTodo::summary() const
{
@@ -125,3 +103,3 @@ QString ToDoEvent::summary() const
}
-ushort ToDoEvent::progress() const
+ushort OTodo::progress() const
{
@@ -129,38 +107,3 @@ ushort ToDoEvent::progress() const
}
-QStringList ToDoEvent::relatedApps() const
-{
- QStringList list;
- QMap<QString, QArray<int> >::ConstIterator it;
- for ( it = data->relations.begin(); it != data->relations.end(); ++it ) {
- list << it.key();
- }
- return list;
-}
-QArray<int> ToDoEvent::relations( const QString& app)const
-{
- QArray<int> tmp;
- QMap<QString, QArray<int> >::ConstIterator it;
- it = data->relations.find( app);
- if ( it != data->relations.end() )
- tmp = it.data();
- return tmp;
-}
-void ToDoEvent::insertCategory(const QString &str )
-{
- changeOrModify();
- qWarning("insert category;" + str );
- data->category.append( str );
-}
-void ToDoEvent::clearCategories()
-{
- changeOrModify();
- data->category.clear();
-}
-void ToDoEvent::setCategories(const QStringList &list )
-{
- changeOrModify();
- qWarning("set categories" + list.join(";") );
- data->category = list;
-}
-QDate ToDoEvent::dueDate()const
+QDate OTodo::dueDate()const
{
@@ -169,3 +112,3 @@ QDate ToDoEvent::dueDate()const
-QDateTime ToDoEvent::alarmDateTime() const
+QDateTime OTodo::alarmDateTime() const
{
@@ -174,3 +117,3 @@ QDateTime ToDoEvent::alarmDateTime() const
-QString ToDoEvent::description()const
+QString OTodo::description()const
{
@@ -178,3 +121,3 @@ QString ToDoEvent::description()const
}
-void ToDoEvent::setCompleted( bool completed )
+void OTodo::setCompleted( bool completed )
{
@@ -183,3 +126,3 @@ void ToDoEvent::setCompleted( bool completed )
}
-void ToDoEvent::setHasDueDate( bool hasDate )
+void OTodo::setHasDueDate( bool hasDate )
{
@@ -188,3 +131,3 @@ void ToDoEvent::setHasDueDate( bool hasDate )
}
-void ToDoEvent::setHasAlarmDateTime( bool hasAlarmDateTime )
+void OTodo::setHasAlarmDateTime( bool hasAlarmDateTime )
{
@@ -193,3 +136,3 @@ void ToDoEvent::setHasAlarmDateTime( bool hasAlarmDateTime )
}
-void ToDoEvent::setDescription(const QString &desc )
+void OTodo::setDescription(const QString &desc )
{
@@ -198,7 +141,3 @@ void ToDoEvent::setDescription(const QString &desc )
}
-void ToDoEvent::setExtra( const QString&, const QString& )
-{
-
-}
-void ToDoEvent::setSummary( const QString& sum )
+void OTodo::setSummary( const QString& sum )
{
@@ -207,10 +146,3 @@ void ToDoEvent::setSummary( const QString& sum )
}
-void ToDoEvent::setCategory( const QString &cat )
-{
- changeOrModify();
- //qWarning("setCategory %s", cat.latin1() );
- data->category.clear();
- data->category << cat;
-}
-void ToDoEvent::setPriority(int prio )
+void OTodo::setPriority(int prio )
{
@@ -219,3 +151,3 @@ void ToDoEvent::setPriority(int prio )
}
-void ToDoEvent::setDueDate( QDate date )
+void OTodo::setDueDate( QDate date )
{
@@ -224,3 +156,3 @@ void ToDoEvent::setDueDate( QDate date )
}
-void ToDoEvent::setAlarmDateTime( const QDateTime& alarm )
+void OTodo::setAlarmDateTime( const QDateTime& alarm )
{
@@ -229,47 +161,3 @@ void ToDoEvent::setAlarmDateTime( const QDateTime& alarm )
}
-void ToDoEvent::addRelated( const QString &app, int id )
-{
- changeOrModify();
-
- QMap<QString, QArray<int> >::Iterator it;
- QArray<int> tmp;
- it = data->relations.find( app );
- if ( it == data->relations.end() ) {
- tmp.resize(1 );
- tmp[0] = id;
- }else{
- tmp = it.data();
- tmp.resize( tmp.size() + 1 );
- tmp[tmp.size() - 1] = id;
- }
- data->relations.replace( app, tmp );
-}
-void ToDoEvent::addRelated(const QString& app, QArray<int> ids )
-{
- changeOrModify();
-
- QMap<QString, QArray<int> >::Iterator it;
- QArray<int> tmp;
- it = data->relations.find( app);
- if ( it == data->relations.end() ) { // not there
- /** tmp.resize( ids.size() ); stupid??
- */
- tmp = ids;
- }else{
- tmp = it.data();
- int offset = tmp.size()-1;
- tmp.resize( tmp.size() + ids.size() );
- for (uint i = 0; i < ids.size(); i++ ) {
- tmp[offset+i] = ids[i];
- }
-
- }
- data->relations.replace( app, tmp );
-}
-void ToDoEvent::clearRelated( const QString& app )
-{
- changeOrModify();
- data->relations.remove( app );
-}
-bool ToDoEvent::isOverdue( )
+bool OTodo::isOverdue( )
{
@@ -279,3 +167,3 @@ bool ToDoEvent::isOverdue( )
}
-void ToDoEvent::setProgress(ushort progress )
+void OTodo::setProgress(ushort progress )
{
@@ -284,2 +172,5 @@ void ToDoEvent::setProgress(ushort progress )
}
+QString OTodo::toShortText() const {
+ return summary();
+}
/*!
@@ -287,3 +178,3 @@ void ToDoEvent::setProgress(ushort progress )
*/
-QString ToDoEvent::richText() const
+QString OTodo::toRichText() const
{
@@ -318,20 +209,6 @@ QString ToDoEvent::richText() const
- // Open database of all categories and get the list of
- // the categories this todoevent belongs to.
- // Then print them...
- // I am not sure whether there is no better way doing this !?
- Categories catdb;
- bool firstloop = true;
- catdb.load( categoryFileName() );
- catlist = allCategories();
-
text += "<b>" + QObject::tr( "Category:") + "</b> ";
- for ( QStringList::Iterator it = catlist.begin(); it != catlist.end(); ++it ) {
- if (!firstloop){
- text += ", ";
- }
- firstloop = false;
- text += catdb.label ("todo", (*it).toInt());
- }
+ text += categoryNames().join(", ");
text += "<br>";
+
return text;
@@ -339,3 +216,3 @@ QString ToDoEvent::richText() const
-bool ToDoEvent::operator<( const ToDoEvent &toDoEvent )const{
+bool OTodo::operator<( const OTodo &toDoEvent )const{
if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true;
@@ -351,3 +228,3 @@ bool ToDoEvent::operator<( const ToDoEvent &toDoEvent )const{
}
-bool ToDoEvent::operator<=(const ToDoEvent &toDoEvent )const
+bool OTodo::operator<=(const OTodo &toDoEvent )const
{
@@ -364,3 +241,3 @@ bool ToDoEvent::operator<=(const ToDoEvent &toDoEvent )const
}
-bool ToDoEvent::operator>(const ToDoEvent &toDoEvent )const
+bool OTodo::operator>(const OTodo &toDoEvent )const
{
@@ -377,3 +254,3 @@ bool ToDoEvent::operator>(const ToDoEvent &toDoEvent )const
}
-bool ToDoEvent::operator>=(const ToDoEvent &toDoEvent )const
+bool OTodo::operator>=(const OTodo &toDoEvent )const
{
@@ -390,3 +267,3 @@ bool ToDoEvent::operator>=(const ToDoEvent &toDoEvent )const
}
-bool ToDoEvent::operator==(const ToDoEvent &toDoEvent )const
+bool OTodo::operator==(const OTodo &toDoEvent )const
{
@@ -406,3 +283,3 @@ bool ToDoEvent::operator==(const ToDoEvent &toDoEvent )const
}
-void ToDoEvent::deref() {
+void OTodo::deref() {
@@ -415,4 +292,5 @@ void ToDoEvent::deref() {
}
-ToDoEvent &ToDoEvent::operator=(const ToDoEvent &item )
+OTodo &OTodo::operator=(const OTodo &item )
{
+ OPimRecord::operator=( item );
//qWarning("operator= ref ");
@@ -421,5 +299,2 @@ ToDoEvent &ToDoEvent::operator=(const ToDoEvent &item )
- data = item.data;
-
-
return *this;
@@ -427,7 +302,7 @@ ToDoEvent &ToDoEvent::operator=(const ToDoEvent &item )
-QMap<int, QString> ToDoEvent::toMap() const {
+QMap<int, QString> OTodo::toMap() const {
QMap<int, QString> map;
- map.insert( Uid, QString::number( data->uid ) );
- map.insert( Category, data->category.join(";") );
+ map.insert( Uid, QString::number( uid() ) );
+ map.insert( Category, idsToString( categories() ) );
map.insert( HasDate, QString::number( data->hasDate ) );
@@ -448,28 +323,3 @@ QMap<int, QString> ToDoEvent::toMap() const {
-
-QString ToDoEvent::crossToString()const {
- QString str;
- QMap<QString, QArray<int> >::ConstIterator it;
- for (it = data->relations.begin(); it != data->relations.end(); ++it ) {
- QArray<int> id = it.data();
- for ( uint i = 0; i < id.size(); ++i ) {
- str += it.key() + "," + QString::number( i ) + ";";
- }
- }
- str = str.remove( str.length()-1, 1); // strip the ;
- //qWarning("IDS " + str );
-
- return str;
-}
-int ToDoEvent::uid()const {
- return data->uid;
-}
-void ToDoEvent::setUid( int id ) {
- if ( id == -1 )
- id = m_gen.generate();
- m_gen.store(id );
- changeOrModify();
- data->uid = id;
-}
-QMap<QString, QString> ToDoEvent::extras()const {
+QMap<QString, QString> OTodo::toExtraMap()const {
return data->extra;
@@ -481,3 +331,3 @@ QMap<QString, QString> ToDoEvent::extras()const {
*/
-void ToDoEvent::changeOrModify() {
+void OTodo::changeOrModify() {
if ( data->count != 1 ) {
@@ -485,3 +335,3 @@ void ToDoEvent::changeOrModify() {
data->deref();
- ToDoEventData* d2 = new ToDoEventData();
+ OTodoData* d2 = new OTodoData();
copy(data, d2 );
@@ -490,3 +340,3 @@ void ToDoEvent::changeOrModify() {
}
-void ToDoEvent::copy( ToDoEventData* src, ToDoEventData* dest ) {
+void OTodo::copy( OTodoData* src, OTodoData* dest ) {
dest->date = src->date;
@@ -495,3 +345,2 @@ void ToDoEvent::copy( ToDoEventData* src, ToDoEventData* dest ) {
dest->priority = src->priority;
- dest->category = src->category;
dest->desc = src->desc;
@@ -499,4 +348,2 @@ void ToDoEvent::copy( ToDoEventData* src, ToDoEventData* dest ) {
dest->extra = src->extra;
- dest->relations = src->relations;
- dest->uid = src->uid;
dest->prog = src->prog;
diff --git a/libopie2/opiepim/otodo.h b/libopie2/opiepim/otodo.h
index 429108a..e1729db 100644
--- a/libopie2/opiepim/otodo.h
+++ b/libopie2/opiepim/otodo.h
@@ -20,3 +20,3 @@ class OTodo : public OPimRecord {
public:
- typedef QValueList<ToDoEvent> ValueList;
+ typedef QValueList<OTodo> ValueList;
enum RecordFields {
@@ -120,2 +120,9 @@ public:
+ /**
+ * reimplementation
+ */
+ QString type()const;
+ QString toShortText()const;
+ QMap<QString, QString> toExtraMap()const;
+ QString recordField(int id )const;
@@ -185,3 +192,3 @@ public:
bool operator==(const OTodo &toDoEvent )const;
- ToDoEvent &operator=(const OTodo &toDoEvent );
+ OTodo &operator=(const OTodo &toDoEvent );
@@ -189,3 +196,3 @@ public:
class OTodoPrivate;
- struct OTodoEventData;
+ struct OTodoData;
@@ -194,11 +201,10 @@ public:
void copy( OTodoData* src, OTodoData* dest );
- ToDoEventPrivate *d;
- ToDoEventData *data;
+ OTodoPrivate *d;
+ OTodoData *data;
- static Qtopia::UidGen m_gen;
-};
- inline bool ToDoEvent::operator!=(const ToDoEvent &toDoEvent )const {
- return !(*this == toDoEvent);
- }
};
+inline bool OTodo::operator!=(const OTodo &toDoEvent )const {
+ return !(*this == toDoEvent);
+}
+