author | zecke <zecke> | 2003-02-14 18:23:40 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-02-14 18:23:40 (UTC) |
commit | fc117979a54fca11e591395b130cfef307deb66f (patch) (side-by-side diff) | |
tree | c2aa7bb2e46a1506b9a8332c8e026aa04b550d2f /core/pim | |
parent | 1f5bb42810965f86ae02fea7cb9df20cbe9aa22f (diff) | |
download | opie-fc117979a54fca11e591395b130cfef307deb66f.zip opie-fc117979a54fca11e591395b130cfef307deb66f.tar.gz opie-fc117979a54fca11e591395b130cfef307deb66f.tar.bz2 |
Remove the #ifdef for QWS
Fix saving of templates
The backends want's to load before it saves...
Oliver now things should work again
-rw-r--r-- | core/pim/todo/todoeditor.cpp | 4 | ||||
-rw-r--r-- | core/pim/todo/todotemplatemanager.cpp | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/core/pim/todo/todoeditor.cpp b/core/pim/todo/todoeditor.cpp index 5aa7097..c204325 100644 --- a/core/pim/todo/todoeditor.cpp +++ b/core/pim/todo/todoeditor.cpp @@ -1,67 +1,63 @@ #include "otaskeditor.h" #include "todoeditor.h" using namespace Todo; Editor::Editor() { m_accepted = false; m_self = 0l; } Editor::~Editor() { delete m_self; m_self = 0; } OTodo Editor::newTodo( int cur, QWidget*) { OTaskEditor *e = self(); e->setCaption( QObject::tr("Enter Task") ); e->init( cur ); -#if defined(Q_WS_QWS) || defined(_WS_QWS_) e->showMaximized(); -#endif int ret = e->exec(); if ( QDialog::Accepted == ret ) { m_accepted = true; }else m_accepted = false; OTodo ev = e->todo(); qWarning("Todo uid"); qWarning("Todo %s %d %d", ev.summary().latin1(), ev.progress(), ev.isCompleted() ); ev.setUid(1); return ev; } OTodo Editor::edit( QWidget *, const OTodo& todo ) { OTaskEditor *e = self(); e->init( todo ); e->setCaption( QObject::tr( "Edit Task" ) ); -#if defined(Q_WS_QWS) || defined(_WS_QWS_) e->showMaximized(); -#endif int ret = e->exec(); OTodo ev = e->todo(); if ( ret == QDialog::Accepted ) m_accepted = true; else m_accepted = false; return ev; } bool Editor::accepted()const { return m_accepted; } OTaskEditor* Editor::self() { if (!m_self ) m_self = new OTaskEditor(0); return m_self; } diff --git a/core/pim/todo/todotemplatemanager.cpp b/core/pim/todo/todotemplatemanager.cpp index 02941ac..5b83f76 100644 --- a/core/pim/todo/todotemplatemanager.cpp +++ b/core/pim/todo/todotemplatemanager.cpp @@ -1,75 +1,81 @@ #include <qpe/config.h> #include <qpe/global.h> #include <opie/otodoaccess.h> #include <opie/otodoaccessxml.h> #include "todotemplatemanager.h" using namespace Todo; TemplateManager::TemplateManager() { m_path = Global::applicationFileName("todolist", "templates.xml"); } TemplateManager::~TemplateManager() { - + save(); } void TemplateManager::load() { Config conf("todolist_templates"); OTodoAccessXML *xml = new OTodoAccessXML( QString::fromLatin1("template"), m_path ); OTodoAccess todoDB(xml ); todoDB.load(); OTodoAccess::List::Iterator it; OTodoAccess::List list = todoDB.allRecords(); for ( it = list.begin(); it != list.end(); ++it ) { OTodo ev = (*it); conf.setGroup( QString::number( ev.uid() ) ); QString str = conf.readEntry("Name", QString::null ); if (str.isEmpty() ) continue; - m_templates.insert( str, - ev ); + m_templates.insert( str, ev ); } } void TemplateManager::save() { + qWarning("Saving!!!!"); Config conf("todolist_templates"); OTodoAccessXML *res = new OTodoAccessXML( "template", m_path ); OTodoAccess db(res); + db.load(); + db.clear(); QMap<QString, OTodo>::Iterator it; for ( it = m_templates.begin(); it != m_templates.end(); ++it ) { OTodo ev = it.data(); conf.setGroup( QString::number( ev.uid() ) ); qWarning("Name" + it.key() ); conf.writeEntry("Name", it.key() ); db.add( ev ); } db.save(); } void TemplateManager::addEvent( const QString& str, const OTodo& ev) { qWarning("AddEvent"+ str ); - m_templates.replace( str, ev ); + OTodo todo = ev; + if( ev.uid() == 0 ) + todo.setUid(1); // generate a new uid + + m_templates.replace( str, todo ); } void TemplateManager::removeEvent( const QString& str ) { m_templates.remove( str ); } QStringList TemplateManager::templates() const { QStringList list; QMap<QString, OTodo>::ConstIterator it; for (it = m_templates.begin(); it != m_templates.end(); ++it ) { list << it.key(); } return list; } OTodo TemplateManager::templateEvent( const QString& templateName ) { return m_templates[templateName]; } |