author | zecke <zecke> | 2002-04-13 23:19:11 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-04-13 23:19:11 (UTC) |
commit | 47f50cc423eab9e36a72bff18d1815d77d5dee00 (patch) (side-by-side diff) | |
tree | 12a46dd96c76de6b4fc6836b7e241f14036e4a2a /core/pim | |
parent | 707f0d3dd81b8ecec2df4e942c0efd2ee51b7fc5 (diff) | |
download | opie-47f50cc423eab9e36a72bff18d1815d77d5dee00.zip opie-47f50cc423eab9e36a72bff18d1815d77d5dee00.tar.gz opie-47f50cc423eab9e36a72bff18d1815d77d5dee00.tar.bz2 |
use OFontMenu still need to catch up with the zaurus todolist
-rw-r--r-- | core/pim/todo/TODO | 3 | ||||
-rw-r--r-- | core/pim/todo/mainwindow.cpp | 9 | ||||
-rw-r--r-- | core/pim/todo/mainwindow.h | 3 |
3 files changed, 13 insertions, 2 deletions
diff --git a/core/pim/todo/TODO b/core/pim/todo/TODO index e5d2f9d..040f163 100644 --- a/core/pim/todo/TODO +++ b/core/pim/todo/TODO @@ -1,3 +1,4 @@ -fix the journal -fix day wrapping update all DueDateItems --when checking the C. box update the deadline
\ No newline at end of file +-when checking the C. box update the deadline +-TodoLabel : public TextView diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp index a34bcf2..b5cace9 100644 --- a/core/pim/todo/mainwindow.cpp +++ b/core/pim/todo/mainwindow.cpp @@ -19,24 +19,25 @@ ** not clear to you. ** **********************************************************************/ #define QTOPIA_INTERNAL_FD #include "mainwindow.h" #include "todoentryimpl.h" #include "todotable.h" #include <opie/tododb.h> #include <opie/todovcalresource.h> +#include <opie/ofontmenu.h> #include <qpe/qpeapplication.h> #include <qpe/config.h> #include <qpe/finddialog.h> #include <qpe/global.h> #include <qpe/ir.h> #include <qpe/qpemenubar.h> #include <qpe/qpemessagebox.h> #include <qpe/resource.h> //#include <qpe/task.h> #include <qpe/qpetoolbar.h> @@ -176,25 +177,25 @@ TodoWindow::TodoWindow( QWidget *parent, const char *name, WFlags f = 0 ) : //a->setEnabled( FALSE ); findAction = a; // qDebug("mainwindow #2: t=%d", t.elapsed() ); completedAction = new QAction( QString::null, tr("Completed tasks"), 0, this, 0, TRUE ); showdeadlineAction = new QAction( QString::null, tr( "Show Deadline" ), 0, this, 0, TRUE ); catMenu->setCheckable( true ); populateCategories(); - mb->insertItem( tr( "Task" ), edit ); + mb->insertItem( tr( "Data" ), edit ); mb->insertItem( tr( "View" ), catMenu ); resize( 200, 300 ); if ( table->numRows() > 0 ) currentEntryChanged( 0, 0 ); connect( table, SIGNAL( signalEdit() ), this, SLOT( slotEdit() ) ); connect( table, SIGNAL(signalShowMenu(const QPoint &)), this, SLOT( slotShowPopup(const QPoint &)) ); // qDebug("mainwindow #3: t=%d", t.elapsed() ); table->updateVisible(); @@ -349,24 +350,30 @@ void TodoWindow::setCategory( int c ) } else { QString cat = table->categories()[c - 2]; table->setShowCategory( cat ); setCaption( tr("Todo") + " - " + cat ); } table->setPaintingEnabled( true ); } void TodoWindow::populateCategories() { catMenu->clear(); + QList<QWidget> list; + list.append(table ); + OFontMenu *menu = new OFontMenu(this, "menu",list ); + menu->forceSize( table->horizontalHeader(), 10 ); + catMenu->insertItem(tr("Fonts"), menu ); + completedAction->addTo( catMenu ); completedAction->setOn( table->showCompleted() ); showdeadlineAction->addTo( catMenu ); showdeadlineAction->setOn( table->showDeadline() ); catMenu->insertSeparator(); int id, rememberId; id = 1; catMenu->insertItem( tr( "All Categories" ), id++ ); // catMenu->insertSeparator(); QStringList categories = table->categories(); categories.append( tr( "Unfiled" ) ); for ( QStringList::Iterator it = categories.begin(); diff --git a/core/pim/todo/mainwindow.h b/core/pim/todo/mainwindow.h index a81c27c..9be7c66 100644 --- a/core/pim/todo/mainwindow.h +++ b/core/pim/todo/mainwindow.h @@ -19,24 +19,25 @@ ** **********************************************************************/ #ifndef MAINWINDOW_H #define MAINWINDOW_H #include <qmainwindow.h> class TodoTable; class QAction; class QPopupMenu; class Ir; +class OFontMenu; class TodoWindow : public QMainWindow { Q_OBJECT public: TodoWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); ~TodoWindow(); public slots: void flush(); void reload(); @@ -68,12 +69,14 @@ private: TodoTable *table; QAction *editAction, *deleteAction, *findAction, * completedAction, *showdeadlineAction ; QPopupMenu *contextMenu, *catMenu; bool syncing; }; #endif + + |