summaryrefslogtreecommitdiff
path: root/core
authordrw <drw>2004-02-25 16:32:24 (UTC)
committer drw <drw>2004-02-25 16:32:24 (UTC)
commitbea97f98bfb31994425908e7ce982b2450696706 (patch) (side-by-side diff)
tree2f2bc2f55d4656b7c63a06cdce6bc35346d9388f /core
parentf84a46fce6c1b7702ec1eaebd40e363b67253649 (diff)
downloadopie-bea97f98bfb31994425908e7ce982b2450696706.zip
opie-bea97f98bfb31994425908e7ce982b2450696706.tar.gz
opie-bea97f98bfb31994425908e7ce982b2450696706.tar.bz2
Todo: libopie->libopie2
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/todo/config.in2
-rw-r--r--core/pim/todo/mainwindow.cpp98
-rw-r--r--core/pim/todo/mainwindow.h26
-rw-r--r--core/pim/todo/opie-todo.control2
-rw-r--r--core/pim/todo/otaskeditor.cpp18
-rw-r--r--core/pim/todo/otaskeditor.h18
-rw-r--r--core/pim/todo/quickedit.h10
-rw-r--r--core/pim/todo/quickeditimpl.cpp6
-rw-r--r--core/pim/todo/quickeditimpl.h4
-rw-r--r--core/pim/todo/smalltodo.h4
-rw-r--r--core/pim/todo/tableview.cpp18
-rw-r--r--core/pim/todo/tableview.h8
-rw-r--r--core/pim/todo/taskeditoralarms.cpp9
-rw-r--r--core/pim/todo/taskeditoralarms.h9
-rw-r--r--core/pim/todo/taskeditoroverview.cpp6
-rw-r--r--core/pim/todo/taskeditoroverview.h10
-rw-r--r--core/pim/todo/taskeditorstatus.cpp9
-rw-r--r--core/pim/todo/taskeditorstatus.h13
-rw-r--r--core/pim/todo/templatedialogimpl.cpp18
-rw-r--r--core/pim/todo/templatedialogimpl.h2
-rw-r--r--core/pim/todo/textviewshow.cpp2
-rw-r--r--core/pim/todo/textviewshow.h2
-rw-r--r--core/pim/todo/todo.pro2
-rw-r--r--core/pim/todo/todoedit.h6
-rw-r--r--core/pim/todo/todoeditor.cpp10
-rw-r--r--core/pim/todo/todoeditor.h8
-rw-r--r--core/pim/todo/todomanager.cpp20
-rw-r--r--core/pim/todo/todomanager.h38
-rw-r--r--core/pim/todo/todoshow.h6
-rw-r--r--core/pim/todo/todotemplatemanager.cpp36
-rw-r--r--core/pim/todo/todotemplatemanager.h11
-rw-r--r--core/pim/todo/todoview.cpp10
-rw-r--r--core/pim/todo/todoview.h20
33 files changed, 237 insertions, 224 deletions
diff --git a/core/pim/todo/config.in b/core/pim/todo/config.in
index 0b6af4c..45c4558 100644
--- a/core/pim/todo/config.in
+++ b/core/pim/todo/config.in
@@ -1,4 +1,4 @@
config TODO
boolean "opie-todo (a Todo-list manager)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index fc189bd..0613f2c 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -19,53 +19,51 @@
 :     =  ...= . :.=-
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = General Public License along with
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#include <unistd.h>
+#include <opie2/opimrecurrence.h>
+#include <opie2/opimnotifymanager.h>
+#include <opie2/otodoaccessvcal.h>
+#include <opie2/oapplicationfactory.h>
+
+#include <qpe/applnk.h>
+#include <qpe/config.h>
+#include <qpe/ir.h>
+#include <qpe/resource.h>
+#include <qpe/qpemessagebox.h>
+#include <qpe/alarmserver.h>
+#include <qpe/timestring.h>
+#include <qpe/qpeapplication.h>
+
#include <qmenubar.h>
#include <qmessagebox.h>
#include <qtoolbar.h>
#include <qpopupmenu.h>
#include <qpushbutton.h>
#include <qwidgetstack.h>
#include <qaction.h>
#include <qtimer.h>
#include <qvbox.h>
#include <qlayout.h>
#include <qlineedit.h>
#include <qwhatsthis.h>
-#include <qpe/applnk.h>
-#include <qpe/config.h>
-#include <qpe/ir.h>
-#include <qpe/resource.h>
-#include <qpe/qpemessagebox.h>
-#include <qpe/alarmserver.h>
-#include <qpe/timestring.h>
-#include <qpe/qpeapplication.h>
-
-#include <opie/orecur.h>
-#include <opie/opimnotifymanager.h>
-#include <opie/otodoaccessvcal.h>
-#include <opie/owidgetstack.h>
-
-#include <opie/oapplicationfactory.h>
-
#include "quickeditimpl.h"
#include "todotemplatemanager.h"
#include "templateeditor.h"
#include "tableview.h"
#include "textviewshow.h"
#include "todoeditor.h"
#include "mainwindow.h"
OPIE_EXPORT_APP( OApplicationFactory<Todo::MainWindow> )
using namespace Todo;
@@ -301,56 +299,56 @@ QPopupMenu* MainWindow::contextMenu( int , bool recur ) {
return menu;
}
QPopupMenu* MainWindow::options() {
qWarning("Options");
return m_options;
}
QPopupMenu* MainWindow::edit() {
return m_edit;
}
QToolBar* MainWindow::toolbar() {
return m_tool;
}
-OTodoAccess::List MainWindow::list()const {
+OPimTodoAccess::List MainWindow::list()const {
return m_todoMgr.list();
}
-OTodoAccess::List MainWindow::sorted( bool asc, int sortOrder ) {
+OPimTodoAccess::List MainWindow::sorted( bool asc, int sortOrder ) {
int cat = 0;
if ( m_curCat != QWidget::tr("All Categories") )
cat = currentCatId();
if ( m_curCat == QWidget::tr("Unfiled") )
cat = -1;
qWarning(" Category %d %s", cat, m_curCat.latin1() );
int filter = 1;
if (!m_completed )
filter |= 4;
if (m_overdue)
filter |= 2;
return m_todoMgr.sorted( asc, sortOrder, filter, cat );
}
-OTodoAccess::List MainWindow::sorted( bool asc, int sortOrder, int addFilter) {
+OPimTodoAccess::List MainWindow::sorted( bool asc, int sortOrder, int addFilter) {
int cat = 0;
if ( m_curCat != QWidget::tr("All Categories") )
cat = currentCatId();
if ( m_curCat == QWidget::tr("Unfiled") )
cat = -1;
return m_todoMgr.sorted(asc, sortOrder, addFilter, cat );
}
-OTodo MainWindow::event( int uid ) {
+OPimTodo MainWindow::event( int uid ) {
return m_todoMgr.event( uid );
}
bool MainWindow::isSyncing()const {
return m_syncing;
}
TemplateManager* MainWindow::templateManager() {
return m_tempManager;
}
Editor* MainWindow::currentEditor() {
return m_curEdit;
}
TodoShow* MainWindow::currentShow() {
@@ -424,86 +422,86 @@ void MainWindow::populateTemplates() {
* slotNewFromTemplate
* We use the edit widget to do
* the config but we setUid(1)
* to get a new uid
*/
/*
* first we get the name of the template
* then we will use the TemplateManager
*/
void MainWindow::slotNewFromTemplate( int id ) {
QString name = m_template->text( id );
- OTodo event = templateManager()->templateEvent( name );
+ OPimTodo event = templateManager()->templateEvent( name );
event = currentEditor()->edit(this,
event );
if ( currentEditor()->accepted() ) {
/* assign new todo */
event.setUid( 1 );
- handleAlarms( OTodo(), event );
+ handleAlarms( OPimTodo(), event );
m_todoMgr.add( event );
currentView()->addEvent( event );
populateCategories();
}
raiseCurrentView();
}
void MainWindow::slotNew() {
create();
}
void MainWindow::slotDuplicate() {
if(m_syncing) {
QMessageBox::warning(this, QWidget::tr("Todo"),
QWidget::tr("Data can not be edited, currently syncing"));
return;
}
- OTodo ev = m_todoMgr.event( currentView()->current() );
+ OPimTodo ev = m_todoMgr.event( currentView()->current() );
/* let's generate a new uid */
ev.setUid(1);
m_todoMgr.add( ev );
currentView()->addEvent( ev );
raiseCurrentView();
}
void MainWindow::slotDelete() {
if (!currentView()->current() )
return;
if(m_syncing) {
QMessageBox::warning(this, QWidget::tr("Todo"),
QWidget::tr("Data can not be edited, currently syncing"));
return;
}
QString strName = currentView()->currentRepresentation();
if (!QPEMessageBox::confirmDelete(this, QWidget::tr("Todo"), strName ) )
return;
- handleAlarms( m_todoMgr.event( currentView()->current() ), OTodo() );
+ handleAlarms( m_todoMgr.event( currentView()->current() ), OPimTodo() );
m_todoMgr.remove( currentView()->current() );
currentView()->removeEvent( currentView()->current() );
raiseCurrentView();
}
void MainWindow::slotDelete(int uid ) {
if( uid == 0 ) return;
if(m_syncing) {
QMessageBox::warning(this, QWidget::tr("Todo"),
QWidget::tr("Data can not be edited, currently syncing"));
return;
}
- OTodo to = m_todoMgr.event(uid);
+ OPimTodo to = m_todoMgr.event(uid);
if (!QPEMessageBox::confirmDelete(this, QWidget::tr("Todo"), to.toShortText() ) )
return;
- handleAlarms(to, OTodo() );
+ handleAlarms(to, OPimTodo() );
m_todoMgr.remove( to.uid() );
currentView()->removeEvent( to.uid() );
raiseCurrentView();
}
void MainWindow::slotDeleteAll() {
if(m_syncing) {
QMessageBox::warning(this, QWidget::tr("Todo"),
QWidget::tr("Data can not be edited, currently syncing"));
return;
}
@@ -588,38 +586,38 @@ void MainWindow::setDocument( const QString& fi) {
receiveFile(fi );
}
static const char *beamfile = "/tmp/opie-todo.vcs";
void MainWindow::slotBeam() {
beam( currentView()->current() );
}
void MainWindow::beamDone( Ir* ir) {
delete ir;
::unlink( beamfile );
}
void MainWindow::receiveFile( const QString& filename ) {
- OTodoAccessVCal* cal = new OTodoAccessVCal(filename );
+ OPimTodoAccessVCal* cal = new OPimTodoAccessVCal(filename );
- OTodoAccess acc( cal );
+ OPimTodoAccess acc( cal );
acc.load();
- OTodoAccess::List list = acc.allRecords();
+ OPimTodoAccess::List list = acc.allRecords();
if (list.count()){
QString message = QWidget::tr("<P>%1 new tasks arrived.<p>Would you like to add them to your Todolist?").arg(list.count() );
if ( QMessageBox::information(this, QWidget::tr("New Tasks"),
message, QMessageBox::Ok,
QMessageBox::Cancel ) == QMessageBox::Ok ) {
- OTodoAccess::List::Iterator it;
+ OPimTodoAccess::List::Iterator it;
for ( it = list.begin(); it != list.end(); ++it )
m_todoMgr.add( (*it) );
currentView()->updateView();
}
}
}
void MainWindow::slotFlush() {
m_syncing = TRUE;
m_todoMgr.save();
}
@@ -699,99 +697,99 @@ void MainWindow::slotShowPrev() {
int l = currentView()->prev();
if (l!=0)
slotShow(l);
}
void MainWindow::slotEdit( int uid ) {
if (uid == 0 ) return;
if(m_syncing) {
QMessageBox::warning(this, QWidget::tr("Todo"),
QWidget::tr("Data can't be edited, currently syncing"));
return;
}
- OTodo old_todo = m_todoMgr.event( uid );
+ OPimTodo old_todo = m_todoMgr.event( uid );
- OTodo todo = currentEditor()->edit(this, old_todo );
+ OPimTodo todo = currentEditor()->edit(this, old_todo );
/* if completed */
if ( currentEditor()->accepted() ) {
handleAlarms( old_todo, todo );
m_todoMgr.update( todo.uid(), todo );
currentView()->replaceEvent( todo );
/* a Category might have changed */
populateCategories();
}
raiseCurrentView();
}
/*
void MainWindow::slotUpdate1( int uid, const SmallTodo& ev) {
m_todoMgr.update( uid, ev );
}
*/
-void MainWindow::updateTodo( const OTodo& ev) {
+void MainWindow::updateTodo( const OPimTodo& ev) {
m_todoMgr.update( ev.uid() , ev );
}
/* The view changed it's configuration
* update the view menu
*/
void MainWindow::slotUpdate3( QWidget* ) {
}
void MainWindow::updateList() {
m_todoMgr.updateList();
}
void MainWindow::setReadAhead( uint count ) {
if (m_todoMgr.todoDB() )
m_todoMgr.todoDB()->setReadAhead( count );
}
void MainWindow::slotQuickEntered() {
qWarning("entered");
- OTodo todo = quickEditor()->todo();
+ OPimTodo todo = quickEditor()->todo();
if (todo.isEmpty() )
return;
m_todoMgr.add( todo );
currentView()->addEvent( todo );
raiseCurrentView();
}
QuickEditBase* MainWindow::quickEditor() {
return m_curQuick;
}
void MainWindow::slotComplete( int uid ) {
slotComplete( event(uid) );
}
-void MainWindow::slotComplete( const OTodo& todo ) {
- OTodo to = todo;
+void MainWindow::slotComplete( const OPimTodo& todo ) {
+ OPimTodo to = todo;
to.setCompleted( !to.isCompleted() );
to.setCompletedDate( QDate::currentDate() );
/*
* if the item does recur
* we need to spin it off
* and update the items duedate to the next
* possible recurrance of this item...
* the spinned off one will loose the
* recurrence.
* We calculate the difference between the old due date and the
* new one and add this diff to start, completed and alarm dates
* -zecke
*/
if ( to.hasRecurrence() && to.isCompleted() ) {
- OTodo to2( to );
+ OPimTodo to2( to );
/* the spinned off one won't recur anymore */
- to.setRecurrence( ORecur() );
+ to.setRecurrence( OPimRecurrence() );
- ORecur rec = to2.recurrence();
+ OPimRecurrence rec = to2.recurrence();
rec.setStart( to.dueDate() );
to2.setRecurrence( rec );
/*
* if there is a next occurence
* from the duedate of the last recurrance
*/
QDate date;
if ( to2.recurrence().nextOcurrence( to2.dueDate().addDays(1), date ) ) {
int dayDiff = to.dueDate().daysTo( date );
qWarning("day diff is %d", dayDiff );
QDate inval;
/* generate a new uid for the old record */
@@ -816,25 +814,25 @@ void MainWindow::slotComplete( const OTodo& todo ) {
/* now the alarms */
if (to2.hasNotifiers() ) {
OPimNotifyManager::Alarms _als = to2.notifiers().alarms();
OPimNotifyManager::Alarms als;
/* for every alarm move the day */
for ( OPimNotifyManager::Alarms::Iterator it = _als.begin(); it != _als.end(); ++it ) {
OPimAlarm al = (*it);
al.setDateTime( al.dateTime().addDays( dayDiff ) );
als.append( al );
}
to2.notifiers().setAlarms( als );
- handleAlarms( OTodo(), todo );
+ handleAlarms( OPimTodo(), todo );
}
to2.setCompletedDate( inval );
to2.setCompleted( false );
updateTodo( to2 );
}else
updateTodo( to );
}else
updateTodo( to );
currentView()->updateView();
raiseCurrentView();
@@ -846,86 +844,86 @@ void MainWindow::reload() {
slotReload();
}
int MainWindow::create() {
int uid = 0;
if(m_syncing) {
QMessageBox::warning(this, QWidget::tr("Todo"),
QWidget::tr("Data can not be edited, currently syncing"));
return uid;
}
m_todoMgr.load();
- OTodo todo = currentEditor()->newTodo( currentCatId(),
+ OPimTodo todo = currentEditor()->newTodo( currentCatId(),
this );
if ( currentEditor()->accepted() ) {
//todo.assignUid();
uid = todo.uid();
- handleAlarms( OTodo(), todo );
+ handleAlarms( OPimTodo(), todo );
m_todoMgr.add( todo );
currentView()->addEvent( todo );
// I'm afraid we must call this every time now, otherwise
// spend expensive time comparing all these strings...
// but only call if we changed something -zecke
populateCategories();
}
raiseCurrentView( );
return uid;
}
/* delete it silently... */
bool MainWindow::remove( int uid ) {
if (m_syncing) return false;
/* argh need to get the whole OEvent... to disable alarms -zecke */
- handleAlarms( OTodo(), m_todoMgr.event( uid ) );
+ handleAlarms( OPimTodo(), m_todoMgr.event( uid ) );
return m_todoMgr.remove( uid );
}
void MainWindow::beam( int uid) {
if( uid == 0 ) return;
::unlink( beamfile );
m_todoMgr.load();
- OTodo todo = event( uid );
- OTodoAccessVCal* cal = new OTodoAccessVCal(QString::fromLatin1(beamfile) );
- OTodoAccess acc( cal );
+ OPimTodo todo = event( uid );
+ OPimTodoAccessVCal* cal = new OPimTodoAccessVCal(QString::fromLatin1(beamfile) );
+ OPimTodoAccess acc( cal );
acc.load();
acc.add( todo );
acc.save();
Ir* ir = new Ir(this );
connect(ir, SIGNAL(done(Ir*) ),
this, SLOT(beamDone(Ir*) ) );
ir->send(beamfile, todo.summary(), "text/x-vCalendar" );
}
void MainWindow::show( int uid ) {
m_todoMgr.load(); // might not be loaded yet
m_showing = true;
slotShow( uid );
raise();
QPEApplication::setKeepRunning();
}
void MainWindow::edit( int uid ) {
m_todoMgr.load();
slotEdit( uid );
}
void MainWindow::add( const OPimRecord& rec) {
- if ( rec.rtti() != OTodo::rtti() ) return;
+ if ( rec.rtti() != OPimTodo::rtti() ) return;
m_todoMgr.load(); // might not be loaded
- const OTodo& todo = static_cast<const OTodo&>(rec);
+ const OPimTodo& todo = static_cast<const OPimTodo&>(rec);
m_todoMgr.add(todo );
currentView()->addEvent( todo );
// I'm afraid we must call this every time now, otherwise
// spend expensive time comparing all these strings...
// but only call if we changed something -zecke
populateCategories();
}
void MainWindow::slotReturnFromView() {
m_showing = false;
@@ -960,25 +958,25 @@ namespace {
}
}
void removeAlarms( const OPimNotifyManager::Alarms& als, int uid ) {
OPimNotifyManager::Alarms::ConstIterator it;
for ( it = als.begin(); it != als.end(); ++it ) {
qWarning("Removinf alarm for %s", (*it).dateTime().toString().latin1() );
AlarmServer::deleteAlarm( (*it).dateTime(), "QPE/Application/todolist", "alarm(QDateTime,int)", uid );
}
}
}
-void MainWindow::handleAlarms( const OTodo& oldTodo, const OTodo& newTodo) {
+void MainWindow::handleAlarms( const OPimTodo& oldTodo, const OPimTodo& newTodo) {
/*
* if oldTodo is not empty and has notifiers we need to find the deleted ones
*/
if(!oldTodo.isEmpty() && oldTodo.hasNotifiers() ) {
OPimNotifyManager::Alarms removed;
OPimNotifyManager::Alarms oldAls = oldTodo.notifiers().alarms();
if (!newTodo.hasNotifiers() )
removed = oldAls;
else
removed = findNonMatching( oldAls, newTodo.notifiers().alarms() );
removeAlarms( removed, oldTodo.uid() );
@@ -988,25 +986,25 @@ void MainWindow::handleAlarms( const OTodo& oldTodo, const OTodo& newTodo) {
if ( oldTodo.isEmpty() || !oldTodo.hasNotifiers() )
added = newTodo.notifiers().alarms();
else
added = findNonMatching( newTodo.notifiers().alarms(), oldTodo.notifiers().alarms() );
addAlarms( added, newTodo.uid() );
}
}
/* we might have not loaded the db */
void MainWindow::doAlarm( const QDateTime& dt, int uid ) {
m_todoMgr.load();
- OTodo todo = m_todoMgr.event( uid );
+ OPimTodo todo = m_todoMgr.event( uid );
if (!todo.hasNotifiers() ) return;
/*
* let's find the right alarm and find out if silent
* then show a richtext widget
*/
bool loud = false;
OPimNotifyManager::Alarms als = todo.notifiers().alarms();
OPimNotifyManager::Alarms::Iterator it;
for ( it = als.begin(); it != als.end(); ++it ) {
if ( (*it).dateTime() == dt ) {
loud = ( (*it).sound() == OPimAlarm::Loud );
diff --git a/core/pim/todo/mainwindow.h b/core/pim/todo/mainwindow.h
index fd0e1bd..6a7296b 100644
--- a/core/pim/todo/mainwindow.h
+++ b/core/pim/todo/mainwindow.h
@@ -22,102 +22,104 @@
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#ifndef TODO_MAIN_WINDOW_H
#define TODO_MAIN_WINDOW_H
#include <qlist.h>
-#include <opie/otodoaccess.h>
-#include <opie/otodo.h>
-#include <opie/opimmainwindow.h>
+#include <opie2/otodoaccess.h>
+#include <opie2/opimtodo.h>
+#include <opie2/opimmainwindow.h>
+#include <opie2/owidgetstack.h>
#include "smalltodo.h"
#include "todoview.h"
#include "quickedit.h"
#include "todomanager.h"
class QPopupMenu;
class QMenuBar;
class QToolBar;
class QAction;
-class OWidgetStack;
class Ir;
class QVBox;
class QLineEdit;
+using namespace Opie;
+
namespace Todo {
typedef TodoView View;
class TemplateManager;
class Editor;
class TodoShow;
class TemplateEditor;
struct QuickEditBase;
class MainWindow : public OPimMainWindow {
Q_OBJECT
friend class TodoView; // avoid QObject here....
friend class TodoShow; // avoid QObject
public:
/* OApplicationFactory application Name */
static QString appName() { return QString::fromLatin1("todolist"); }
MainWindow( QWidget *parent = 0,
const char* name = 0, WFlags fl = 0 );
~MainWindow();
- /** return a context menu for an OTodo */
+ /** return a context menu for an OPimTodo */
QPopupMenu* contextMenu(int uid, bool doesRecur = FALSE );
QPopupMenu* options();
QPopupMenu* edit();
QToolBar* toolbar();
void updateList();
- OTodoAccess::List list()const;
- OTodoAccess::List sorted( bool asc, int sortOrder );
- OTodoAccess::List sorted( bool asc, int sortOrder, int addFilter );
+ OPimTodoAccess::List list()const;
+ OPimTodoAccess::List sorted( bool asc, int sortOrder );
+ OPimTodoAccess::List sorted( bool asc, int sortOrder, int addFilter );
- OTodo event(int uid );
+ OPimTodo event(int uid );
bool isSyncing()const;
bool showCompleted()const;
bool showDeadline()const;
bool showOverDue()const;
bool showQuickTask()const;
QString currentCategory()const;
int currentCatId();
TemplateManager* templateManager();
QuickEditBase* quickEditor();
- void updateTodo( const OTodo& );
+ void updateTodo( const OPimTodo& );
void populateTemplates();
Editor* currentEditor();
void setReadAhead(uint count );
private slots:
void slotQuickEntered();
void populateCategories();
void slotReload();
void slotFlush();
protected:
void closeEvent( QCloseEvent* e );
private:
/* handle setting and removing alarms */
- void handleAlarms( const OTodo& oldTodo, const OTodo& newTodo );
+ void handleAlarms( const OPimTodo& oldTodo, const OPimTodo& newTodo );
void receiveFile( const QString& filename );
void connectBase( ViewBase* );
void initUI();
void initActions();
void initConfig();
void initViews();
void initEditor();
void initShow();
void initTemplate();
void raiseCurrentView();
ViewBase* currentView();
ViewBase* m_curView;
@@ -156,25 +158,25 @@ private slots:
TodoManager m_todoMgr;
QString m_curCat;
QList<ViewBase> m_views;
uint m_counter;
TemplateManager* m_tempManager;
private slots:
void slotShow(int);
void slotEdit(int);
void slotUpdate3( QWidget* );
void slotComplete( int uid );
- void slotComplete( const OTodo& ev );
+ void slotComplete( const OPimTodo& ev );
void slotNewFromTemplate(int id );
void slotNew();
void slotDuplicate();
void slotDelete();
void slotDelete(int uid );
void slotDeleteAll();
void slotDeleteCompleted();
void slotEdit();
void slotFind();
diff --git a/core/pim/todo/opie-todo.control b/core/pim/todo/opie-todo.control
index 8ad50b2..3a65c04 100644
--- a/core/pim/todo/opie-todo.control
+++ b/core/pim/todo/opie-todo.control
@@ -1,10 +1,10 @@
Package: opie-todo
Files: plugins/application/libtodolist.so* bin/todolist apps/1Pim/todo.desktop
Priority: optional
Section: opie/pim
Maintainer: Holger 'zecke' Freyther <zecke@handhelds.org>
Architecture: arm
-Depends: task-opie-minimal, libopie1, opie-pics
+Depends: task-opie-minimal, libopiecore2, libopieui2, libopiepim2, opie-pics
Description: Todo list manager
A Todo list manager for the Opie environment.
Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/todo/otaskeditor.cpp b/core/pim/todo/otaskeditor.cpp
index 1ed20b4..ab1ce94 100644
--- a/core/pim/todo/otaskeditor.cpp
+++ b/core/pim/todo/otaskeditor.cpp
@@ -1,61 +1,59 @@
#include <qlayout.h>
-#include <opie/orecurrancewidget.h>
-
#include "taskeditoroverview.h"
#include "taskeditorstatus.h"
#include "taskeditoralarms.h"
#include "otaskeditor.h"
OTaskEditor::OTaskEditor(int cur)
: QDialog( 0, 0, TRUE, WStyle_ContextHelp ) {
init();
init( cur );
}
-OTaskEditor::OTaskEditor( const OTodo& to)
+OTaskEditor::OTaskEditor( const OPimTodo& to)
: QDialog( 0, 0, TRUE, WStyle_ContextHelp ) {
init();
init( to );
}
OTaskEditor::~OTaskEditor() {
}
void OTaskEditor::init( int cur ) {
- OTodo to;
+ OPimTodo to;
to.setUid( 1 ); // generate a new uid
if ( cur != 0 )
to.setCategories( cur );
load(to);
}
-void OTaskEditor::init( const OTodo& to ) {
+void OTaskEditor::init( const OPimTodo& to ) {
load( to );
}
-OTodo OTaskEditor::todo()const{
+OPimTodo OTaskEditor::todo()const{
qWarning("saving!");
- OTodo to ( m_todo );
+ OPimTodo to ( m_todo );
m_overView->save( to );
m_stat->save( to );
to.setRecurrence( m_rec->recurrence() );
m_alarm->save( to );
return to;
}
-void OTaskEditor::load(const OTodo& to) {
+void OTaskEditor::load(const OPimTodo& to) {
m_overView->load( to );
m_stat->load( to );
m_rec->setRecurrence( to.recurrence(), to.hasDueDate() ? to.dueDate() : QDate::currentDate() );
m_alarm->load( to );
-
+
m_todo = to;
}
void OTaskEditor::init() {
setCaption(tr("Task Editor") );
QVBoxLayout* layo = new QVBoxLayout( this );
m_tab = new OTabWidget( this );
layo->addWidget( m_tab );
/*
* Add the Widgets
*/
@@ -66,25 +64,25 @@ void OTaskEditor::init() {
m_tab->addTab( m_stat, "todo/TodoList", tr("Status") );
m_alarm = new TaskEditorAlarms( m_tab );
m_tab->addTab( m_alarm, "todo/alarm", tr("Alarms") );
// m_remind = new TaskEditorAlarms( m_tab );
// m_tab->addTab( m_remind, "todo/reminder", tr("Reminders") );
// QLabel* lbl = new QLabel( m_tab );
// lbl->setText( tr("X-Ref") );
// m_tab->addTab( lbl, "todo/xref", tr("X-Ref") );
- m_rec = new ORecurranceWidget( true, QDate::currentDate(), this );
+ m_rec = new OPimRecurrenceWidget( true, QDate::currentDate(), this );
m_tab->addTab( m_rec, "repeat", tr("Recurrence") );
/* signal and slots */
connect(m_overView, SIGNAL(recurranceEnabled(bool) ),
m_rec, SLOT(setEnabled(bool) ) );
/* connect due date changed to the recurrence tab */
connect(m_stat, SIGNAL(dueDateChanged(const QDate&) ),
m_rec, SLOT(setStartDate(const QDate& ) ) );
diff --git a/core/pim/todo/otaskeditor.h b/core/pim/todo/otaskeditor.h
index 2daae52..7068df8 100644
--- a/core/pim/todo/otaskeditor.h
+++ b/core/pim/todo/otaskeditor.h
@@ -1,43 +1,43 @@
#ifndef OPIE_TASK_EDITOR_H
#define OPIE_TASK_EDITOR_H
#include <qdialog.h>
-#include <opie/otodo.h>
-#include <opie/otabwidget.h>
+#include <opie2/opimtodo.h>
+#include <opie2/otabwidget.h>
+#include <opie2/opimrecurrencewidget.h>
class TaskEditorOverView;
class TaskEditorStatus;
class TaskEditorAlarms;
-class ORecurranceWidget;
class QMultiLineEdit;
class OTaskEditor : public QDialog {
Q_OBJECT
public:
OTaskEditor(int cur);
- OTaskEditor( const OTodo& todo );
+ OTaskEditor( const OPimTodo& todo );
~OTaskEditor();
/*
* same as the c'tor but this gives us the
* power to 'preload' the dialog
*/
void init( int cur );
- void init( const OTodo& todo );
+ void init( const OPimTodo& todo );
- OTodo todo()const;
+ OPimTodo todo()const;
private:
- void load( const OTodo& );
+ void load( const OPimTodo& );
void init();
OTabWidget *m_tab;
TaskEditorOverView *m_overView;
TaskEditorStatus *m_stat;
TaskEditorAlarms *m_alarm;
TaskEditorAlarms *m_remind;
- ORecurranceWidget *m_rec;
- OTodo m_todo;
+ OPimRecurrenceWidget *m_rec;
+ OPimTodo m_todo;
};
#endif
diff --git a/core/pim/todo/quickedit.h b/core/pim/todo/quickedit.h
index 5fe74fe..0c0c204 100644
--- a/core/pim/todo/quickedit.h
+++ b/core/pim/todo/quickedit.h
@@ -1,44 +1,46 @@
#ifndef OPIE_QUICK_EDIT_H
#define OPIE_QUICK_EDIT_H
#include <qsignal.h>
#include <qwidget.h>
-#include <opie/otodo.h>
+#include <opie2/opimtodo.h>
+
+using Opie::OPimTodo;
namespace Todo{
class MainWindow;
struct QuickEditBase {
- virtual OTodo todo()const = 0l;
+ virtual OPimTodo todo()const = 0l;
virtual QSignal* signal() = 0l;
virtual QWidget* widget() = 0l;
};
/*
* this is my second try
* of signal and slots with namespaces
* and templates
* I use a different approach now
* I give a QSignal away
* and have a protected method called emit
*/
/**
* Quick edit is meant to quickly enter
- * OTodos in a fast way
+ * OPimTodos in a fast way
*/
class QuickEdit : public QuickEditBase{
public:
QuickEdit(MainWindow* main );
virtual ~QuickEdit();
- //OTodo todo()const;
+ //OPimTodo todo()const;
QSignal* signal();
//QWidget* widget();
protected:
MainWindow* mainWindow();
void commit();
private:
MainWindow* m_main;
QSignal* m_sig;
};
};
diff --git a/core/pim/todo/quickeditimpl.cpp b/core/pim/todo/quickeditimpl.cpp
index 1863ef4..cd0684f 100644
--- a/core/pim/todo/quickeditimpl.cpp
+++ b/core/pim/todo/quickeditimpl.cpp
@@ -1,19 +1,19 @@
#include <qaction.h>
#include <qlineedit.h>
#include <qwhatsthis.h>
#include <qpe/resource.h>
-#include <opie/oclickablelabel.h>
+#include <opie2/oclickablelabel.h>
#include "mainwindow.h"
#include "quickeditimpl.h"
QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible )
: QToolBar( (QMainWindow *)parent ), Todo::QuickEdit( (Todo::MainWindow *)parent ) {
setHorizontalStretchable( TRUE );
// Load priority icons
// TODO - probably should be done globally somewhere else,
// see also tableview.cpp/h, taskeditoroverview.cpp/h
@@ -53,32 +53,32 @@ QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible )
m_visible = visible;
if ( !m_visible ) {
hide();
}
m_menu = 0l;
reinit();
}
QuickEditImpl::~QuickEditImpl() {
}
-OTodo QuickEditImpl::todo()const {
+OPimTodo QuickEditImpl::todo()const {
return m_todo;
}
QWidget* QuickEditImpl::widget() {
return this;
}
void QuickEditImpl::slotEnter() {
- OTodo todo;
+ OPimTodo todo;
if (!m_edit->text().isEmpty() ) {
todo.setUid(1 ); // new uid
todo.setPriority( m_state );
todo.setSummary( m_edit->text() );
if ( ((Todo::MainWindow *)parent())->currentCatId() != 0 )
todo.setCategories( ((Todo::MainWindow *)parent())->currentCatId() );
m_todo = todo;
commit();
}
diff --git a/core/pim/todo/quickeditimpl.h b/core/pim/todo/quickeditimpl.h
index 89b94f8..d465dba 100644
--- a/core/pim/todo/quickeditimpl.h
+++ b/core/pim/todo/quickeditimpl.h
@@ -6,36 +6,36 @@
#include <qtoolbar.h>
#include "quickedit.h"
class QLineEdit;
class QLabel;
class QuickEditImpl : public QToolBar, public Todo::QuickEdit {
Q_OBJECT
public:
QuickEditImpl( QWidget* parent, bool visible);
~QuickEditImpl();
- OTodo todo()const;
+ OPimTodo todo()const;
QWidget* widget();
private slots:
void slotEnter();
void slotPrio();
void slotMore();
void slotCancel();
private:
void reinit();
int m_state;
QLabel* m_lbl;
QLineEdit* m_edit;
QLabel* m_enter;
QLabel* m_more;
QPopupMenu* m_menu;
- OTodo m_todo;
+ OPimTodo m_todo;
bool m_visible;
QPixmap priority1;
QPixmap priority3;
QPixmap priority5;
};
#endif
diff --git a/core/pim/todo/smalltodo.h b/core/pim/todo/smalltodo.h
index 952ed04..963218e 100644
--- a/core/pim/todo/smalltodo.h
+++ b/core/pim/todo/smalltodo.h
@@ -28,26 +28,26 @@
#ifndef TODO_SMALL_TODO_H
#define TODO_SMALL_TODO_H
#include <qdatetime.h>
#include <qstring.h>
#include <qstringlist.h>
namespace Todo {
/**
* SmallTodo holds everything necessary
- * to represent a OTodo without holding
- * everything from a OTodo
+ * to represent a OPimTodo without holding
+ * everything from a OPimTodo
*/
class SmallTodo {
public:
SmallTodo(int uid = 0,
bool comp = false,
const QDate& date = QDate::currentDate(),
const QString& = QString::null,
const QStringList& = QStringList() );
SmallTodo( const SmallTodo& );
~SmallTodo();
bool operator==( const SmallTodo& );
diff --git a/core/pim/todo/tableview.cpp b/core/pim/todo/tableview.cpp
index d980a24..5bbf880 100644
--- a/core/pim/todo/tableview.cpp
+++ b/core/pim/todo/tableview.cpp
@@ -28,25 +28,25 @@
#include <stdlib.h>
#include <cmath>
#include <cctype>
#include <qcombobox.h>
#include <qlineedit.h>
#include <qtimer.h>
#include <qpopupmenu.h>
#include <qpe/config.h>
#include <qpe/resource.h>
-#include <opie/orecur.h>
+#include <opie2/opimrecurrence.h>
#include "mainwindow.h"
//#include "tableitems.h"
#include "tableview.h"
using namespace Todo;
namespace {
static const int BoxSize = 14;
static const int RowHeight = 20;
}
@@ -175,83 +175,83 @@ int TableView::next() {
if ( currentRow() + 1 >= numRows() ) return 0;
setCurrentCell( currentRow() +1, currentColumn() );
return sorted().uidAt( currentRow() );
}
int TableView::prev() {
if ( numRows() == 0 ) return 0;
if ( currentRow() - 1 < 0 ) return 0;
setCurrentCell( currentRow() -1, currentColumn() );
return sorted().uidAt( currentRow() );
}
QString TableView::currentRepresentation() {
- OTodo to = sorted()[currentRow()];
+ OPimTodo to = sorted()[currentRow()];
return to.summary().isEmpty() ? to.description().left(20) : to.summary() ;
}
/* show overdue */
void TableView::showOverDue( bool ) {
clear();
updateView();
}
void TableView::updateView( ) {
qWarning("update view");
m_row = false;
static int id;
id = startTimer(4000 );
/* FIXME we want one page to be read!
*
* Calculate that screensize
*/
todoWindow()->setReadAhead( 4 );
sort();
- OTodoAccess::List::Iterator it, end;
+ OPimTodoAccess::List::Iterator it, end;
it = sorted().begin();
end = sorted().end();
qWarning("setTodos");
QTime time;
time.start();
m_enablePaint = false;
setUpdatesEnabled( false );
viewport()->setUpdatesEnabled( false );
setNumRows( it.count() );
if ( it.count() == 0 )
killTimer(id);
// int elc = time.elapsed();
setUpdatesEnabled( true );
viewport()->setUpdatesEnabled( true );
viewport()->update();
m_enablePaint = true;
// int el = time.elapsed();
}
-void TableView::setTodo( int, const OTodo&) {
+void TableView::setTodo( int, const OPimTodo&) {
sort();
/* repaint */
repaint();
}
-void TableView::addEvent( const OTodo&) {
+void TableView::addEvent( const OPimTodo&) {
/* fix problems of not showing the 'Haken' */
updateView();
}
/*
* find the event
* and then replace the complete row
*/
-void TableView::replaceEvent( const OTodo& ev) {
+void TableView::replaceEvent( const OPimTodo& ev) {
addEvent( ev );
}
/*
* re aligning table can be slow too
* FIXME: look what performs better
* either this or the old align table
*/
void TableView::removeEvent( int ) {
updateView();
}
void TableView::setShowCompleted( bool b) {
qWarning("Show Completed %d" , b );
@@ -379,25 +379,25 @@ void TableView::viewportPaintEvent( QPaintEvent* e) {
QTable::viewportPaintEvent( e );
}
/*
* This segment is copyrighted by TT
* it was taken from their todolist
* application this code is GPL
*/
void TableView::paintCell(QPainter* p, int row, int col, const QRect& cr, bool ) {
const QColorGroup &cg = colorGroup();
p->save();
- OTodo task = sorted()[row];
+ OPimTodo task = sorted()[row];
// TODO - give user option for grid or bars?
// Paint alternating background bars
if ( (row % 2 ) == 0 ) {
p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) );
p->setPen( QPen( cg.text() ) );
}
else {
p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Background ) );
p->setPen( QPen( cg.buttonText() ) );
}
@@ -488,36 +488,36 @@ QWidget* TableView::createEditor(int row, int col, bool )const {
}
case 0:
default:
return 0l;
}
}
void TableView::setCellContentFromEditor(int row, int col ) {
qWarning("set cell content from editor");
if ( col == 1 ) {
QWidget* wid = cellWidget(row, 1 );
if ( wid->inherits("QComboBox") ) {
int pri = ((QComboBox*)wid)->currentItem() + 1;
- OTodo todo = sorted()[row];
+ OPimTodo todo = sorted()[row];
if ( todo.priority() != pri ) {
todo.setPriority( pri );
TodoView::update( todo.uid(), todo );
updateView();
}
}
}else if ( col == 2) {
QWidget* wid = cellWidget(row, 2);
if ( wid->inherits("QLineEdit") ) {
QString text = ((QLineEdit*)wid)->text();
- OTodo todo = sorted()[row];
+ OPimTodo todo = sorted()[row];
if ( todo.summary() != text ) {
todo.setSummary( text );
TodoView::update( todo.uid(), todo );
updateView();
}
}
}
}
void TableView::slotPriority() {
setCellContentFromEditor( currentRow(), currentColumn() );
}
/*
diff --git a/core/pim/todo/tableview.h b/core/pim/todo/tableview.h
index 528ddc9..7f78255 100644
--- a/core/pim/todo/tableview.h
+++ b/core/pim/todo/tableview.h
@@ -47,41 +47,41 @@ namespace Todo {
~TableView();
QString type()const;
int current();
QString currentRepresentation();
int next();
int prev();
void clear();
void showOverDue( bool );
void updateView();
- void setTodo( int uid, const OTodo& );
- void addEvent( const OTodo& event );
- void replaceEvent( const OTodo& );
+ void setTodo( int uid, const OPimTodo& );
+ void addEvent( const OPimTodo& event );
+ void replaceEvent( const OPimTodo& );
void removeEvent( int uid );
void setShowCompleted( bool );
void setShowDeadline( bool );
void setShowCategory(const QString& =QString::null );
void newDay();
QWidget* widget();
void sortColumn(int, bool, bool );
/*
* we do our drawing ourselves
* because we don't want to have
* 40.000 QTableItems for 10.000
- * OTodos where we only show 10 at a time!
+ * OPimTodos where we only show 10 at a time!
*/
void paintCell(QPainter* p, int row, int col, const QRect&, bool );
private:
/* reimplented for internal reasons */
void viewportPaintEvent( QPaintEvent* );
QTimer *m_menuTimer;
bool m_enablePaint:1;
QString m_oleCat;
bool m_first : 1;
QPixmap m_pic_completed;
QPixmap m_pic_priority[ 5 ];
diff --git a/core/pim/todo/taskeditoralarms.cpp b/core/pim/todo/taskeditoralarms.cpp
index bcc40fe..930c94e 100644
--- a/core/pim/todo/taskeditoralarms.cpp
+++ b/core/pim/todo/taskeditoralarms.cpp
@@ -19,27 +19,26 @@
 :     =  ...= . :.=-
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = General Public License along with
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#include "taskeditoralarms.h"
-#include <opie/otodo.h>
-#include <opie/opimnotifymanager.h>
-#include <opie/otimepicker.h>
+#include <opie2/opimnotifymanager.h>
+#include <opie2/otimepicker.h>
#include <qpe/datebookmonth.h>
#include <qpe/resource.h>
#include <qlistview.h>
#include <qlayout.h>
class AlarmItem : public QListViewItem {
public:
AlarmItem( QListView*, const OPimAlarm& );
~AlarmItem();
@@ -113,39 +112,39 @@ void TaskEditorAlarms::slotNew(){
void TaskEditorAlarms::slotEdit(){
}
void TaskEditorAlarms::slotDelete(){
QListViewItem* item = lstAlarms->currentItem();
if (!item) return;
lstAlarms->takeItem( item ); delete item;
}
-void TaskEditorAlarms::load( const OTodo& todo) {
+void TaskEditorAlarms::load( const OPimTodo& todo) {
lstAlarms->clear();
if (!todo.hasNotifiers() ) return;
OPimNotifyManager::Alarms als = todo.notifiers().alarms();
if (als.isEmpty() ) return;
OPimNotifyManager::Alarms::Iterator it = als.begin();
for ( ; it != als.end(); ++it )
(void)new AlarmItem( lstAlarms, (*it) );
}
-void TaskEditorAlarms::save( OTodo& todo ) {
+void TaskEditorAlarms::save( OPimTodo& todo ) {
if (lstAlarms->childCount() <= 0 ) return;
OPimNotifyManager::Alarms alarms;
for ( QListViewItem* item = lstAlarms->firstChild(); item; item = item->nextSibling() ) {
AlarmItem *alItem = static_cast<AlarmItem*>(item);
alarms.append( alItem->alarm() );
}
OPimNotifyManager& manager = todo.notifiers();
manager.setAlarms( alarms );
}
diff --git a/core/pim/todo/taskeditoralarms.h b/core/pim/todo/taskeditoralarms.h
index 0aa52cc..2379b0c 100644
--- a/core/pim/todo/taskeditoralarms.h
+++ b/core/pim/todo/taskeditoralarms.h
@@ -20,45 +20,48 @@
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = General Public License along with
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#ifndef TASKEDITORALARMS_H
#define TASKEDITORALARMS_H
+#include <opie2/opimtodo.h>
+
#include <qwidget.h>
class QListView;
class QListViewItem;
-class OTodo;
+
+using namespace Opie;
class AlarmItem;
class DateBookMonth;
class TaskEditorAlarms : public QWidget
{
Q_OBJECT
public:
enum Type {
Alarm = 0,
Reminders
};
TaskEditorAlarms( QWidget* parent = 0, int type = Alarm, const char* name = 0, WFlags fl = 0 );
~TaskEditorAlarms();
- void load( const OTodo& );
- void save( OTodo& );
+ void load( const OPimTodo& );
+ void save( OPimTodo& );
private:
QPopupMenu* popup( int column );
void inlineSetDate( AlarmItem*, const QPoint& p );
void inlineSetTime( AlarmItem*);
void inlineSetType( AlarmItem*, const QPoint& p );
QListView* lstAlarms;
QPopupMenu* m_date;
QPopupMenu* m_time;
QPopupMenu* m_type;
DateBookMonth* m_dbMonth;
diff --git a/core/pim/todo/taskeditoroverview.cpp b/core/pim/todo/taskeditoroverview.cpp
index 415dcf2..294acb9 100644
--- a/core/pim/todo/taskeditoroverview.cpp
+++ b/core/pim/todo/taskeditoroverview.cpp
@@ -19,25 +19,25 @@
 :     =  ...= . :.=-
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = General Public License along with
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#include "taskeditoroverview.h"
-#include <opie/orecur.h>
+//#include <opie2/opimrecurrence.h>
#include <qpe/categoryselect.h>
#include <qpe/datebookmonth.h>
#include <qpe/resource.h>
#include <qcheckbox.h>
#include <qlabel.h>
#include <qlayout.h>
#include <qmultilineedit.h>
#include <qwhatsthis.h>
TaskEditorOverView::TaskEditorOverView( QWidget* parent, const char* name, WFlags fl )
@@ -118,46 +118,46 @@ TaskEditorOverView::TaskEditorOverView( QWidget* parent, const char* name, WFla
layout->addWidget( label, 5, 0 );
QWhatsThis::add( label, tr( "Enter any additional information about this task here." ) );
mleNotes = new QMultiLineEdit( container );
mleNotes->setWordWrap( QMultiLineEdit::WidgetWidth );
layout->addMultiCellWidget( mleNotes, 6, 6, 0, 1 );
QWhatsThis::add( mleNotes, tr( "Enter any additional information about this task here." ) );
}
TaskEditorOverView::~TaskEditorOverView()
{
}
-void TaskEditorOverView::load( const OTodo& todo )
+void TaskEditorOverView::load( const OPimTodo& todo )
{
// Description
cmbDesc->insertItem( todo.summary(), 0 );
cmbDesc->setCurrentItem( 0 );
// Priority
cmbPriority->setCurrentItem( todo.priority() - 1 );
// Category
cmbCategory->setCategories( todo.categories(), "Todo List", tr( "Todo List" ) );
// Recurrence
ckbRecurrence->setChecked( todo.hasRecurrence() );
emit recurranceEnabled( todo.hasRecurrence() );
// Notes
mleNotes->setText( todo.description() );
}
-void TaskEditorOverView::save( OTodo &todo )
+void TaskEditorOverView::save( OPimTodo &todo )
{
// Description
todo.setSummary( cmbDesc->currentText() );
// Priority
todo.setPriority( cmbPriority->currentItem() + 1 );
// Category
if ( cmbCategory->currentCategory() != -1 )
{
QArray<int> arr = cmbCategory->currentCategories();
todo.setCategories( arr );
diff --git a/core/pim/todo/taskeditoroverview.h b/core/pim/todo/taskeditoroverview.h
index d5f5125..89679f1 100644
--- a/core/pim/todo/taskeditoroverview.h
+++ b/core/pim/todo/taskeditoroverview.h
@@ -20,50 +20,52 @@
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = General Public License along with
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#ifndef TASKEDITOROVERVIEW_H
#define TASKEDITOROVERVIEW_H
-#include <opie/otodo.h>
+#include <opie2/opimtodo.h>
#include <qpixmap.h>
#include <qwidget.h>
class CategorySelect;
class QCheckBox;
class QComboBox;
class QMultiLineEdit;
+using namespace Opie;
+
class TaskEditorOverView : public QWidget
-{
+{
Q_OBJECT
public:
TaskEditorOverView( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~TaskEditorOverView();
QComboBox *cmbDesc;
QComboBox *cmbPriority;
CategorySelect *cmbCategory;
QCheckBox *ckbRecurrence;
QMultiLineEdit *mleNotes;
- void load( const OTodo & );
- void save( OTodo & );
+ void load( const OPimTodo & );
+ void save( OPimTodo & );
signals:
void recurranceEnabled( bool );
protected:
QPixmap m_pic_priority[ 5 ];
protected slots:
void slotRecClicked();
};
#endif // TASKEDITOROVERVIEW_H
diff --git a/core/pim/todo/taskeditorstatus.cpp b/core/pim/todo/taskeditorstatus.cpp
index 98e3cea..367dd58 100644
--- a/core/pim/todo/taskeditorstatus.cpp
+++ b/core/pim/todo/taskeditorstatus.cpp
@@ -19,27 +19,26 @@
 :     =  ...= . :.=-
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = General Public License along with
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#include "taskeditorstatus.h"
-#include <opie/otodo.h>
-#include <opie/opimmaintainer.h>
-#include <opie/opimstate.h>
+#include <opie2/opimmaintainer.h>
+#include <opie2/opimstate.h>
#include <qpe/datebookmonth.h>
#include <qcheckbox.h>
#include <qcombobox.h>
#include <qlabel.h>
#include <qlayout.h>
#include <qwhatsthis.h>
// FIXME add the hack slots instead of setPopup!!!!
// drw you shouldn't have removed them
@@ -162,25 +161,25 @@ TaskEditorStatus::TaskEditorStatus( QWidget* parent, const char* name, WFlags f
QWhatsThis::add( txtMaintainer, tr( "This is the name of the current task maintainer." ) );
tbtMaintainer = new QToolButton( container );
tbtMaintainer->setPixmap( Resource::loadPixmap( "todo/more" ) );
// layout->addWidget( tbtMaintainer, 7, 2 );
QWhatsThis::add( tbtMaintainer, tr( "Click here to select the task maintainer." ) );
#endif
}
TaskEditorStatus::~TaskEditorStatus()
{
}
-void TaskEditorStatus::load( const OTodo &todo )
+void TaskEditorStatus::load( const OPimTodo &todo )
{
QDate date = QDate::currentDate();
QString str = TimeString::longDateString( date );
// Status
int state = todo.hasState()? todo.state().state() : OPimState::NotStarted;
if ( state == OPimState::Undefined )
state = OPimState::NotStarted;
cmbStatus->setCurrentItem( state );
// Progress
cmbProgress->setCurrentItem( todo.progress() / 20 );
@@ -214,25 +213,25 @@ void TaskEditorStatus::load( const OTodo &todo )
btnComp->setText( str );
// Maintainer Mode
#if 0
state = todo.hasMaintainer() ? todo.maintainer().mode() : OPimMaintainer::Nothing;
if ( state == OPimMaintainer::Undefined )
state = OPimMaintainer::Nothing;
cmbMaintMode->setCurrentItem( state );
#endif
// Maintainer - not implemented yet
}
-void TaskEditorStatus::save( OTodo &todo )
+void TaskEditorStatus::save( OPimTodo &todo )
{
QDate inval;
// Status
todo.setState( OPimState( cmbStatus->currentItem() ) );
// Progress
todo.setProgress( cmbProgress->currentItem() * 20 );
// Start date
if ( ckbStart->isChecked() )
{
diff --git a/core/pim/todo/taskeditorstatus.h b/core/pim/todo/taskeditorstatus.h
index 3544200..97129f0 100644
--- a/core/pim/todo/taskeditorstatus.h
+++ b/core/pim/todo/taskeditorstatus.h
@@ -20,71 +20,74 @@
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = General Public License along with
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#ifndef TASKEDITORSTATUS_H
#define TASKEDITORSTATUS_H
+#include <opie2/opimtodo.h>
+
#include <qdatetime.h>
#include <qwidget.h>
class DateBookMonth;
-class OTodo;
class QCheckBox;
class QComboBox;
class QLabel;
class QPushButton;
class QToolButton;
+using namespace Opie;
+
/**
* This is the implementation of the Opie Task Editor Advanced tab
* it features the State!
* MaintainerMode
* Description
*/
class TaskEditorStatus : public QWidget
-{
+{
Q_OBJECT
public:
TaskEditorStatus( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~TaskEditorStatus();
QComboBox *cmbStatus;
QLabel *txtMaintainer;
QToolButton *tbtMaintainer;
QComboBox *cmbMaintMode;
QCheckBox *ckbDue;
QPushButton *btnDue;
QCheckBox *ckbStart;
QPushButton *btnStart;
QCheckBox *ckbComp;
QPushButton *btnComp;
QComboBox *cmbProgress;
/*
* I could have a struct which returns a QWidget*
- * load and save to a OTodo
+ * load and save to a OPimTodo
* and use multiple inheretence with all other widgets
* and then simply iterate over the list of structs
* this way I could easily have plugins for the whole editor....
* but I do not do it -zecke
*/
- void load( const OTodo & );
- void save( OTodo & );
+ void load( const OPimTodo & );
+ void save( OPimTodo & );
private:
QDate m_start;
QDate m_comp;
QDate m_due;
DateBookMonth *m_startBook;
DateBookMonth *m_compBook;
DateBookMonth *m_dueBook;
private slots:
void slotStartChecked();
void slotCompChecked();
diff --git a/core/pim/todo/templatedialogimpl.cpp b/core/pim/todo/templatedialogimpl.cpp
index 63d8107..c9ad3d0 100644
--- a/core/pim/todo/templatedialogimpl.cpp
+++ b/core/pim/todo/templatedialogimpl.cpp
@@ -6,56 +6,56 @@
#include "templatedialogimpl.h"
using namespace Todo;
/* TRANSLATOR Todo::TemplateDialogImpl */
namespace {
class TemplateListItem : public QListViewItem {
public:
TemplateListItem( QListView*,
const QString& name,
- const OTodo& );
+ const OPimTodo& );
~TemplateListItem();
- OTodo event()const;
+ OPimTodo event()const;
QString text()const;
void setText(const QString& str );
- void setEvent( const OTodo& );
+ void setEvent( const OPimTodo& );
private:
QString m_name;
- OTodo m_ev;
+ OPimTodo m_ev;
};
/* implementation */
TemplateListItem::TemplateListItem( QListView* view,
const QString& text,
- const OTodo& ev )
+ const OPimTodo& ev )
: QListViewItem( view ), m_name( text ), m_ev( ev )
{
QListViewItem::setText(0, m_name );
}
TemplateListItem::~TemplateListItem() {}
- OTodo TemplateListItem::event() const {
+ OPimTodo TemplateListItem::event() const {
return m_ev;
}
QString TemplateListItem::text()const {
return m_name;
}
void TemplateListItem::setText( const QString& str ) {
QListViewItem::setText(0, str );
m_name = str;
}
- void TemplateListItem::setEvent( const OTodo& ev) {
+ void TemplateListItem::setEvent( const OPimTodo& ev) {
m_ev = ev;
}
}
TemplateDialogImpl::TemplateDialogImpl( MainWindow* win,
TemplateManager* man )
: TemplateDialog( win ), m_win( win), m_man( man )
{
/* fill the listview */
/* not the fastest way.... */
QStringList list = man->templates();
for (QStringList::Iterator it = list.begin();
@@ -63,45 +63,45 @@ TemplateDialogImpl::TemplateDialogImpl( MainWindow* win,
new TemplateListItem( listView(), (*it), man->templateEvent( (*it) ) );
}
listView()->addColumn( QWidget::tr("Name") );
connect( listView(), SIGNAL(clicked(QListViewItem*) ),
this, SLOT(slotClicked(QListViewItem*) ) );
}
TemplateDialogImpl::~TemplateDialogImpl() {
}
void TemplateDialogImpl::slotAdd() {
QString str = QWidget::tr("New Template %1").arg( listView()->childCount() );
- OTodo ev;
+ OPimTodo ev;
m_man->addEvent(str, ev);
new TemplateListItem( listView(), str, ev );
}
void TemplateDialogImpl::slotRemove() {
if (!listView()->currentItem() )
return;
TemplateListItem* item = static_cast<TemplateListItem*>( listView()->currentItem() );
listView()->takeItem( item );
m_man->removeEvent( item->text() );
delete item;
}
void TemplateDialogImpl::slotEdit() {
if ( !listView()->currentItem() )
return;
TemplateListItem* item = static_cast<TemplateListItem*>( listView()->currentItem() );
- OTodo ev = m_win->currentEditor()->edit( m_win, item->event() );
+ OPimTodo ev = m_win->currentEditor()->edit( m_win, item->event() );
if ( m_win->currentEditor()->accepted() ) {
item->setEvent( ev );
m_man->removeEvent( item->text() );
m_man->addEvent( item->text(), ev );
}
}
/*
* we need to update
* the text
*/
void TemplateDialogImpl::slotReturn() {
diff --git a/core/pim/todo/templatedialogimpl.h b/core/pim/todo/templatedialogimpl.h
index f366c9e..cc78521 100644
--- a/core/pim/todo/templatedialogimpl.h
+++ b/core/pim/todo/templatedialogimpl.h
@@ -1,18 +1,18 @@
#ifndef OPIE_TEMPLATE_DIALOG_IMPL_H
#define OPIE_TEMPLATE_DIALOG_IMPL_H
#include <qlistview.h>
-#include <opie/otodo.h>
+#include <opie2/opimtodo.h>
#include "templatedialog.h"
namespace Todo {
class MainWindow;
class TemplateManager;
class TemplateDialogImpl : public Todo::TemplateDialog {
Q_OBJECT
public:
TemplateDialogImpl( MainWindow* win, TemplateManager* );
diff --git a/core/pim/todo/textviewshow.cpp b/core/pim/todo/textviewshow.cpp
index 35ea74b..01e5810 100644
--- a/core/pim/todo/textviewshow.cpp
+++ b/core/pim/todo/textviewshow.cpp
@@ -2,25 +2,25 @@
using namespace Todo;
TextViewShow::TextViewShow( QWidget* parent, MainWindow* win)
: QTextView( parent ), TodoShow(win) {
}
TextViewShow::~TextViewShow() {
}
QString TextViewShow::type()const {
return QString::fromLatin1("TextViewShow");
}
-void TextViewShow::slotShow( const OTodo& ev ) {
+void TextViewShow::slotShow( const OPimTodo& ev ) {
setText( ev.toRichText() );
}
QWidget* TextViewShow::widget() {
return this;
}
void TextViewShow::keyPressEvent( QKeyEvent* event ) {
switch( event->key() ) {
case Qt::Key_Up:
if ( ( visibleHeight() < contentsHeight() ) &&
( verticalScrollBar()->value() > verticalScrollBar()->minValue() ) )
scrollBy( 0, -(visibleHeight()-20) );
else
diff --git a/core/pim/todo/textviewshow.h b/core/pim/todo/textviewshow.h
index 498de81..cc31522 100644
--- a/core/pim/todo/textviewshow.h
+++ b/core/pim/todo/textviewshow.h
@@ -1,20 +1,20 @@
#include <qtextview.h>
#include "todoshow.h"
namespace Todo {
class TextViewShow : public QTextView, public TodoShow {
public:
TextViewShow( QWidget* parent, MainWindow* );
~TextViewShow();
QString type()const;
- void slotShow( const OTodo& ev );
+ void slotShow( const OPimTodo& ev );
QWidget* widget();
protected:
void keyPressEvent( QKeyEvent* );
};
};
diff --git a/core/pim/todo/todo.pro b/core/pim/todo/todo.pro
index 51cfde7..9267082 100644
--- a/core/pim/todo/todo.pro
+++ b/core/pim/todo/todo.pro
@@ -35,15 +35,15 @@ SOURCES = smalltodo.cpp \
templatedialog.cpp \
templatedialogimpl.cpp \
quickeditimpl.cpp \
quickedit.cpp \
otaskeditor.cpp \
taskeditoroverview.cpp \
taskeditorstatus.cpp \
taskeditoralarms.cpp
TARGET = todolist
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lopie
+LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2
include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/todo/todoedit.h b/core/pim/todo/todoedit.h
index 02800ca..4e89e93 100644
--- a/core/pim/todo/todoedit.h
+++ b/core/pim/todo/todoedit.h
@@ -1,17 +1,17 @@
#ifndef OPIE_TODO_EDIT_H
#define OPIE_TODO_EDIT_H
-#include <opie/otodo.h>
+#include <opie2/opimtodo.h>
namespace Todo {
class Edit {
public:
Edit();
virtual ~Edit();
- ToDoEvent newEvent( const OTodo& ) = 0;
- ToDoEvent editEvent( const OTodo& ) = 0;
+ ToDoEvent newEvent( const OPimTodo& ) = 0;
+ ToDoEvent editEvent( const OPimTodo& ) = 0;
};
};
#endif
diff --git a/core/pim/todo/todoeditor.cpp b/core/pim/todo/todoeditor.cpp
index 78aedd6..879d809 100644
--- a/core/pim/todo/todoeditor.cpp
+++ b/core/pim/todo/todoeditor.cpp
@@ -5,54 +5,54 @@
#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,
+OPimTodo Editor::newTodo( int cur,
QWidget*) {
OTaskEditor *e = self();
e->setCaption( QObject::tr("Enter Task") );
e->init( cur );
int ret = QPEApplication::execDialog( e );
if ( QDialog::Accepted == ret ) {
m_accepted = true;
}else
m_accepted = false;
- OTodo ev = e->todo();
+ OPimTodo 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 ) {
+OPimTodo Editor::edit( QWidget *,
+ const OPimTodo& todo ) {
OTaskEditor *e = self();
e->init( todo );
e->setCaption( QObject::tr( "Edit Task" ) );
int ret = QPEApplication::execDialog( e );
- OTodo ev = e->todo();
+ OPimTodo 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 )
diff --git a/core/pim/todo/todoeditor.h b/core/pim/todo/todoeditor.h
index fe30634..bcfd205 100644
--- a/core/pim/todo/todoeditor.h
+++ b/core/pim/todo/todoeditor.h
@@ -1,29 +1,29 @@
#ifndef OPIE_TODO_EDITOR_H
#define OPIE_TODO_EDITOR_H
-#include <opie/otodo.h>
+#include <opie2/opimtodo.h>
class OTaskEditor;
namespace Todo {
class Editor {
public:
Editor();
~Editor();
- OTodo newTodo( int currentCatId,
+ OPimTodo newTodo( int currentCatId,
QWidget* par );
- OTodo edit( QWidget* par,
- const OTodo& ev = OTodo() );
+ OPimTodo edit( QWidget* par,
+ const OPimTodo& ev = OPimTodo() );
bool accepted()const;
protected:
OTaskEditor* self();
private:
bool m_accepted: 1;
OTaskEditor* m_self;
};
};
#endif
diff --git a/core/pim/todo/todomanager.cpp b/core/pim/todo/todomanager.cpp
index 501cca7..21e1d0c 100644
--- a/core/pim/todo/todomanager.cpp
+++ b/core/pim/todo/todomanager.cpp
@@ -33,64 +33,64 @@ using namespace Todo;
TodoManager::TodoManager( QObject *obj )
: QObject( obj ) {
m_db = 0l;
QTime time;
time.start();
int el = time.elapsed();
qWarning("QTimer for loading %d", el/1000 );
}
TodoManager::~TodoManager() {
delete m_db;
}
-OTodo TodoManager::event(int uid ) {
+OPimTodo TodoManager::event(int uid ) {
return m_db->find( uid );
}
void TodoManager::updateList() {
qWarning("update list");
m_list = m_db->allRecords();
}
-OTodoAccess::List TodoManager::list() const{
+OPimTodoAccess::List TodoManager::list() const{
return m_list;
}
-OTodoAccess::List TodoManager::sorted( bool asc, int so, int f, int cat ) {
+OPimTodoAccess::List TodoManager::sorted( bool asc, int so, int f, int cat ) {
return m_db->sorted( asc, so, f, cat );
}
-OTodoAccess::List::Iterator TodoManager::overDue() {
+OPimTodoAccess::List::Iterator TodoManager::overDue() {
int filter = 2 | 1;
m_list = m_db->sorted(m_asc, m_sortOrder, filter, m_ca );
m_it = m_list.begin();
return m_it;
}
-OTodoAccess::List::Iterator TodoManager::fromTo( const QDate& start,
+OPimTodoAccess::List::Iterator TodoManager::fromTo( const QDate& start,
const QDate& end ) {
m_list = m_db->effectiveToDos( start, end );
m_it = m_list.begin();
return m_it;
}
-OTodoAccess::List::Iterator TodoManager::query( const OTodo& ev, int query ) {
+OPimTodoAccess::List::Iterator TodoManager::query( const OPimTodo& ev, int query ) {
m_list = m_db->queryByExample( ev, query );
m_it = m_list.begin();
return m_it;
}
-OTodoAccess* TodoManager::todoDB() {
+OPimTodoAccess* TodoManager::todoDB() {
return m_db;
}
-void TodoManager::add( const OTodo& ev ) {
+void TodoManager::add( const OPimTodo& ev ) {
m_db->add( ev );
}
void TodoManager::update( int, const SmallTodo& ) {
}
-void TodoManager::update( int, const OTodo& ev) {
+void TodoManager::update( int, const OPimTodo& ev) {
m_db->replace( ev );
}
bool TodoManager::remove( int uid ) {
return m_db->remove( uid );
}
void TodoManager::removeAll() {
m_db->clear();
}
void TodoManager::removeCompleted() {
m_db->removeAllCompleted();
}
void TodoManager::save() {
@@ -112,16 +112,16 @@ QStringList TodoManager::categories() {
int TodoManager::catId( const QString& cats ) {
return m_cat.id( "Todo List", cats );
}
void TodoManager::remove( const QArray<int>& ids) {
for (uint i=0; i < ids.size(); i++ )
remove( ids[i] );
}
bool TodoManager::isLoaded()const {
return (m_db == 0 );
}
void TodoManager::load() {
if (!m_db) {
- m_db = new OTodoAccess();
+ m_db = new OPimTodoAccess();
m_db->load();
}
}
diff --git a/core/pim/todo/todomanager.h b/core/pim/todo/todomanager.h
index 8544277..865b47b 100644
--- a/core/pim/todo/todomanager.h
+++ b/core/pim/todo/todomanager.h
@@ -20,92 +20,94 @@
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = Library General Public License along with
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#ifndef OPIE_TODO_MANAGER_H
#define OPIE_TODO_MANAGER_H
-#include <qarray.h>
-#include <qobject.h>
-#include <qstring.h>
+#include <opie2/opimtodo.h>
+#include <opie2/otodoaccess.h>
#include <qpe/categories.h>
-#include <opie/otodo.h>
-#include <opie/otodoaccess.h>
+#include <qarray.h>
+#include <qobject.h>
+#include <qstring.h>
#include "smalltodo.h"
+using Opie::OPimTodo;
+using Opie::OPimTodoAccess;
namespace Todo {
class TodoManager : public QObject{
Q_OBJECT
public:
bool isLoaded()const;
void load();
TodoManager(QObject* obj = 0);
~TodoManager();
QStringList categories()/*const*/;
int catId(const QString&);
- OTodo event(int uid );
+ OPimTodo event(int uid );
void updateList();
/** returns the iterator sorted if set sorted*/
- OTodoAccess::List list()const;
- OTodoAccess::List sorted( bool asc, int so, int f, int cat );
+ OPimTodoAccess::List list()const;
+ OPimTodoAccess::List sorted( bool asc, int so, int f, int cat );
- OTodoAccess::List::Iterator overDue();
- OTodoAccess::List::Iterator fromTo( const QDate& start,
+ OPimTodoAccess::List::Iterator overDue();
+ OPimTodoAccess::List::Iterator fromTo( const QDate& start,
const QDate& end );
- OTodoAccess::List::Iterator query( const OTodo& ev, int query );
+ OPimTodoAccess::List::Iterator query( const OPimTodo& ev, int query );
void setCategory( bool sort, int category = -1);
void setShowOverDue( bool show );
void setSortOrder( int sortOrder );
void setSortASC( bool );
void sort();
- OTodoAccess* todoDB();
+ OPimTodoAccess* todoDB();
bool saveAll();
signals:
void update();
void updateCategories();
public slots:
- void add( const OTodo& );
+ void add( const OPimTodo& );
void update( int uid, const SmallTodo& );
- void update( int uid, const OTodo& );
+ void update( int uid, const OPimTodo& );
bool remove( int uid );
void remove( const QArray<int>& );
/**
* remove all completed
*/
void removeCompleted();
void removeAll();
void reload();
void save();
private:
- OTodoAccess* m_db;
- OTodoAccess::List m_list;
- OTodoAccess::List::Iterator m_it;
- OTodoAccess::List m_sorted;
+ OPimTodoAccess* m_db;
+ OPimTodoAccess::List m_list;
+ OPimTodoAccess::List::Iterator m_it;
+ OPimTodoAccess::List m_sorted;
Categories m_cat;
int m_ca;
/* sort cat */
bool m_shCat;
int m_sortOrder;
bool m_asc;
};
};
#endif
diff --git a/core/pim/todo/todoshow.h b/core/pim/todo/todoshow.h
index 2babe93..1eeadf8 100644
--- a/core/pim/todo/todoshow.h
+++ b/core/pim/todo/todoshow.h
@@ -22,39 +22,41 @@
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#ifndef TODO_TODO_SHOW_H
#define TODO_TODO_SHOW_H
#include <qstring.h>
#include <qwidget.h>
-#include <opie/otodo.h>
+#include <opie2/opimtodo.h>
+
+using Opie::OPimTodo;
namespace Todo {
class MainWindow;
/**
* TodoShow is the baseclass of
* of all TodoShows.
* The first implementation is a QTextView
* implementation showing the Todo as richtext
*/
class TodoShow {
public:
TodoShow( MainWindow* win);
virtual ~TodoShow();
virtual QString type()const = 0;
- virtual void slotShow( const OTodo& ev ) = 0;
+ virtual void slotShow( const OPimTodo& ev ) = 0;
virtual QWidget* widget() = 0;
protected:
void escapeView();
void showNext();
void showPrev();
private:
MainWindow *m_win;
};
};
#endif
diff --git a/core/pim/todo/todotemplatemanager.cpp b/core/pim/todo/todotemplatemanager.cpp
index 5b83f76..eeac51b 100644
--- a/core/pim/todo/todotemplatemanager.cpp
+++ b/core/pim/todo/todotemplatemanager.cpp
@@ -1,81 +1,81 @@
+#include <opie2/otodoaccess.h>
+#include <opie2/otodoaccessxml.h>
+
#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"),
+ OPimTodoAccessXML *xml = new OPimTodoAccessXML( QString::fromLatin1("template"),
m_path );
- OTodoAccess todoDB(xml );
+ OPimTodoAccess todoDB(xml );
todoDB.load();
- OTodoAccess::List::Iterator it;
- OTodoAccess::List list = todoDB.allRecords();
+ OPimTodoAccess::List::Iterator it;
+ OPimTodoAccess::List list = todoDB.allRecords();
for ( it = list.begin(); it != list.end(); ++it ) {
- OTodo ev = (*it);
+ OPimTodo ev = (*it);
conf.setGroup( QString::number( ev.uid() ) );
QString str = conf.readEntry("Name", QString::null );
if (str.isEmpty() )
continue;
m_templates.insert( str, ev );
}
}
void TemplateManager::save() {
qWarning("Saving!!!!");
Config conf("todolist_templates");
- OTodoAccessXML *res = new OTodoAccessXML( "template",
+ OPimTodoAccessXML *res = new OPimTodoAccessXML( "template",
m_path );
- OTodoAccess db(res);
+ OPimTodoAccess db(res);
db.load();
db.clear();
- QMap<QString, OTodo>::Iterator it;
+ QMap<QString, OPimTodo>::Iterator it;
for ( it = m_templates.begin(); it != m_templates.end(); ++it ) {
- OTodo ev = it.data();
+ OPimTodo 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) {
+ const OPimTodo& ev) {
qWarning("AddEvent"+ str );
- OTodo todo = ev;
+ OPimTodo todo = ev;
if( ev.uid() == 0 )
- todo.setUid(1); // generate a new uid
-
+ 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;
+ QMap<QString, OPimTodo>::ConstIterator it;
for (it = m_templates.begin(); it != m_templates.end(); ++it ) {
list << it.key();
}
return list;
}
-OTodo TemplateManager::templateEvent( const QString& templateName ) {
+OPimTodo TemplateManager::templateEvent( const QString& templateName ) {
return m_templates[templateName];
}
diff --git a/core/pim/todo/todotemplatemanager.h b/core/pim/todo/todotemplatemanager.h
index 387ced1..ee8aaaf 100644
--- a/core/pim/todo/todotemplatemanager.h
+++ b/core/pim/todo/todotemplatemanager.h
@@ -1,32 +1,33 @@
#ifndef OPIE_TODO_TEMPLATE_H
#define OPIE_TODO_TEMPLATE_H
+#include <opie2/opimtodo.h>
+
#include <qstring.h>
#include <qmap.h>
-#include <opie/otodo.h>
-
+using namespace Opie;
namespace Todo {
class TemplateManager {
public:
TemplateManager();
~TemplateManager();
void load();
void save();
QStringList templates()const;
- OTodo templateEvent( const QString& templateName );
+ OPimTodo templateEvent( const QString& templateName );
/* also replaces one */
- void addEvent( const QString&, const OTodo& );
+ void addEvent( const QString&, const OPimTodo& );
void removeEvent( const QString& );
private:
QString m_path;
- QMap<QString, OTodo> m_templates;
+ QMap<QString, OPimTodo> m_templates;
};
};
#endif
diff --git a/core/pim/todo/todoview.cpp b/core/pim/todo/todoview.cpp
index 31047cf..d99cf77 100644
--- a/core/pim/todo/todoview.cpp
+++ b/core/pim/todo/todoview.cpp
@@ -10,60 +10,60 @@ using namespace Todo;
TodoView::TodoView( MainWindow* win )
: m_main( win )
{
m_asc = false;
m_sortOrder = -1;
}
TodoView::~TodoView() {
};
MainWindow* TodoView::todoWindow() {
return m_main;
}
-OTodo TodoView::event(int uid ) {
+OPimTodo TodoView::event(int uid ) {
return m_main->event( uid );
}
-OTodoAccess::List TodoView::list(){
+OPimTodoAccess::List TodoView::list(){
todoWindow()->updateList();
return todoWindow()->list();
}
-OTodoAccess::List TodoView::sorted()const{
+OPimTodoAccess::List TodoView::sorted()const{
return m_sort;
}
void TodoView::sort() {
m_sort = todoWindow()->sorted(m_asc,m_sortOrder );
qWarning("m_sort.count() = %d", m_sort.count() );
}
void TodoView::sort(int sort) {
m_sort = todoWindow()->sorted(m_asc, m_sortOrder, sort );
}
void TodoView::setSortOrder( int order ) {
m_sortOrder = order;
}
void TodoView::setAscending( bool b ) {
qWarning("setAscending %d", b );
m_asc = b;
}
void TodoView::update(int, const SmallTodo& ) {
//m_main->slotUpate1( uid, to );
}
-void TodoView::update(int , const OTodo& ev ) {
+void TodoView::update(int , const OPimTodo& ev ) {
m_main->updateTodo( ev );
}
void TodoView::showTodo( int uid ) {
m_main->slotShow( uid );
}
void TodoView::edit( int uid ) {
m_main->slotEdit( uid );
}
void TodoView::remove( int uid ) {
m_main->m_todoMgr.remove( uid );
}
void TodoView::complete( int uid ) {
m_main->slotComplete( uid );
}
-void TodoView::complete( const OTodo& ev ) {
+void TodoView::complete( const OPimTodo& ev ) {
m_main->slotComplete( ev );
}
void TodoView::removeQuery( int uid ) {
m_main->slotDelete( uid );
}
diff --git a/core/pim/todo/todoview.h b/core/pim/todo/todoview.h
index e5ed66f..a5ea9f5 100644
--- a/core/pim/todo/todoview.h
+++ b/core/pim/todo/todoview.h
@@ -25,28 +25,30 @@
Boston, MA 02111-1307, USA.
*/
#ifndef TODO_VIEW_H
#define TODO_VIEW_H
#include <qarray.h>
#include <qstring.h>
#include <qvaluelist.h>
#include <qwidget.h>
-#include <opie/otodoaccess.h>
+#include <opie2/otodoaccess.h>
#include "smalltodo.h"
+using Opie::OPimTodo;
+using Opie::OPimTodoAccess;
namespace Todo {
class MainWindow;
/**
* due to inheretince problems we need this base class
*/
struct ViewBase {
public:
virtual QWidget* widget() = 0;
virtual QString type()const = 0;
virtual int current() = 0;
@@ -59,26 +61,26 @@ namespace Todo {
virtual int next() = 0;
/**
* the previous record or 0 if none is there..
*/
virtual int prev() = 0;
/*
* update the view
*/
virtual void updateView() = 0;
- virtual void addEvent( const OTodo& ) = 0;
- virtual void replaceEvent( const OTodo& ) = 0;
+ virtual void addEvent( const OPimTodo& ) = 0;
+ virtual void replaceEvent( const OPimTodo& ) = 0;
virtual void removeEvent( int uid ) = 0;
virtual void setShowCompleted( bool ) = 0;
virtual void setShowDeadline( bool ) = 0;
virtual void setShowCategory( const QString& = QString::null ) = 0;
virtual void clear() = 0;
virtual void newDay() = 0;
};
/**
* A base class for all TodoView which are showing
* a list of todos.
* Either in a QTable, QListView or any other QWidget
@@ -95,42 +97,42 @@ namespace Todo {
/**
* c'tor
*/
TodoView( MainWindow* win );
/**
*d'tor
*/
virtual ~TodoView();
protected:
MainWindow* todoWindow();
- OTodo event(int uid );
- OTodoAccess::List list();
- OTodoAccess::List sorted()const;
+ OPimTodo event(int uid );
+ OPimTodoAccess::List list();
+ OPimTodoAccess::List sorted()const;
void sort();
void sort(int sort );
void setSortOrder( int order );
void setAscending( bool );
/*
* These things needs to be implemented
* in a implementation
*/
void showTodo( int uid );
void edit( int uid );
void update(int uid, const SmallTodo& to );
- void update(int uid, const OTodo& ev);
+ void update(int uid, const OPimTodo& ev);
void remove( int uid );
/* will ask the user if the item should be deleted */
void removeQuery(int uid );
void complete( int uid );
- void complete( const OTodo& ev );
+ void complete( const OPimTodo& ev );
private:
MainWindow *m_main;
- OTodoAccess::List m_sort;
+ OPimTodoAccess::List m_sort;
bool m_asc : 1;
int m_sortOrder;
};
};
#endif