summaryrefslogtreecommitdiff
authorzecke <zecke>2002-04-13 23:19:11 (UTC)
committer zecke <zecke>2002-04-13 23:19:11 (UTC)
commit47f50cc423eab9e36a72bff18d1815d77d5dee00 (patch) (unidiff)
tree12a46dd96c76de6b4fc6836b7e241f14036e4a2a
parent707f0d3dd81b8ecec2df4e942c0efd2ee51b7fc5 (diff)
downloadopie-47f50cc423eab9e36a72bff18d1815d77d5dee00.zip
opie-47f50cc423eab9e36a72bff18d1815d77d5dee00.tar.gz
opie-47f50cc423eab9e36a72bff18d1815d77d5dee00.tar.bz2
use OFontMenu still need to catch up with the zaurus todolist
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/todo/TODO3
-rw-r--r--core/pim/todo/mainwindow.cpp9
-rw-r--r--core/pim/todo/mainwindow.h3
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 @@
1-fix the journal 1-fix the journal
2-fix day wrapping update all DueDateItems 2-fix day wrapping update all DueDateItems
3-when checking the C. box update the deadline \ No newline at end of file 3-when checking the C. box update the deadline
4-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
@@ -25,12 +25,13 @@
25#include "mainwindow.h" 25#include "mainwindow.h"
26#include "todoentryimpl.h" 26#include "todoentryimpl.h"
27#include "todotable.h" 27#include "todotable.h"
28 28
29#include <opie/tododb.h> 29#include <opie/tododb.h>
30#include <opie/todovcalresource.h> 30#include <opie/todovcalresource.h>
31#include <opie/ofontmenu.h>
31 32
32#include <qpe/qpeapplication.h> 33#include <qpe/qpeapplication.h>
33#include <qpe/config.h> 34#include <qpe/config.h>
34#include <qpe/finddialog.h> 35#include <qpe/finddialog.h>
35#include <qpe/global.h> 36#include <qpe/global.h>
36#include <qpe/ir.h> 37#include <qpe/ir.h>
@@ -182,13 +183,13 @@ TodoWindow::TodoWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
182 183
183 showdeadlineAction = new QAction( QString::null, tr( "Show Deadline" ), 0, this, 0, TRUE ); 184 showdeadlineAction = new QAction( QString::null, tr( "Show Deadline" ), 0, this, 0, TRUE );
184 185
185 catMenu->setCheckable( true ); 186 catMenu->setCheckable( true );
186 populateCategories(); 187 populateCategories();
187 188
188 mb->insertItem( tr( "Task" ), edit ); 189 mb->insertItem( tr( "Data" ), edit );
189 mb->insertItem( tr( "View" ), catMenu ); 190 mb->insertItem( tr( "View" ), catMenu );
190 191
191 resize( 200, 300 ); 192 resize( 200, 300 );
192 if ( table->numRows() > 0 ) 193 if ( table->numRows() > 0 )
193 currentEntryChanged( 0, 0 ); 194 currentEntryChanged( 0, 0 );
194 connect( table, SIGNAL( signalEdit() ), 195 connect( table, SIGNAL( signalEdit() ),
@@ -355,12 +356,18 @@ void TodoWindow::setCategory( int c )
355} 356}
356 357
357void TodoWindow::populateCategories() 358void TodoWindow::populateCategories()
358{ 359{
359 catMenu->clear(); 360 catMenu->clear();
360 361
362 QList<QWidget> list;
363 list.append(table );
364 OFontMenu *menu = new OFontMenu(this, "menu",list );
365 menu->forceSize( table->horizontalHeader(), 10 );
366 catMenu->insertItem(tr("Fonts"), menu );
367
361 completedAction->addTo( catMenu ); 368 completedAction->addTo( catMenu );
362 completedAction->setOn( table->showCompleted() ); 369 completedAction->setOn( table->showCompleted() );
363 showdeadlineAction->addTo( catMenu ); 370 showdeadlineAction->addTo( catMenu );
364 showdeadlineAction->setOn( table->showDeadline() ); 371 showdeadlineAction->setOn( table->showDeadline() );
365 catMenu->insertSeparator(); 372 catMenu->insertSeparator();
366 int id, rememberId; 373 int id, rememberId;
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
@@ -25,12 +25,13 @@
25#include <qmainwindow.h> 25#include <qmainwindow.h>
26 26
27class TodoTable; 27class TodoTable;
28class QAction; 28class QAction;
29class QPopupMenu; 29class QPopupMenu;
30class Ir; 30class Ir;
31class OFontMenu;
31 32
32class TodoWindow : public QMainWindow 33class TodoWindow : public QMainWindow
33{ 34{
34 Q_OBJECT 35 Q_OBJECT
35 36
36public: 37public:
@@ -74,6 +75,8 @@ private:
74 QPopupMenu *contextMenu, *catMenu; 75 QPopupMenu *contextMenu, *catMenu;
75 76
76 bool syncing; 77 bool syncing;
77}; 78};
78 79
79#endif 80#endif
81
82