Minor update to work with new OPimMainWindow

1 files changed, 12 insertions, 11 deletions

diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index 75da27c..9013522 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -48,127 +48,128 @@ _;:,   .>  :=|.         This program is free software; you can
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qstringlist.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 
 #include "quickeditimpl.h"
 #include "todotemplatemanager.h"
 #include "templatedialogimpl.h"
 #include "tableview.h"
 
 #include "textviewshow.h"
 #include "todoeditor.h"
 #include "newtaskdlg.h"
 #include "mainwindow.h"
 
 using Opie::Core::OApplicationFactory;
 OPIE_EXPORT_APP( OApplicationFactory<Todo::MainWindow> )
 
 using namespace Opie;
 using namespace Todo;
 
 MainWindow::MainWindow( QWidget* parent,
                         const char* name, WFlags )
-    : Opie::OPimMainWindow( "Todolist", tr( "Todo List" ), "Todo List", tr( "Task" ), "todo",
+    : Opie::OPimMainWindow( "Todolist", "Todo List", tr( "Task" ), "todo",
                             parent, name, WType_TopLevel | WStyle_ContextHelp )
 {
+    setCaption( tr( "Todo List" ) );
     if (!name)
         setName("todo window");
 
     m_syncing = false;
     m_showing = false;
     m_counter = 0;
     m_tempManager = new TemplateManager();
     m_tempManager->load();
 
     initConfig();
     initUI();
     initViews();
     initActions();
     initEditor();
     initShow();
 
     raiseCurrentView();
     QTimer::singleShot( 0, this, SLOT(initStuff()) );
 }
-void MainWindow::initStuff() {   
+void MainWindow::initStuff() {
     m_todoMgr.load();
     setViewCategory( m_curCat );
     setCategory( m_curCat );
 }
 void MainWindow::initActions() {
     // Insert Task menu items
     QActionGroup *items = new QActionGroup( this, QString::null, false );
-    
+
     m_deleteCompleteAction = new QAction( QString::null, QWidget::tr( "Delete completed" ),
                                           0, items, 0 );
     connect( m_deleteCompleteAction, SIGNAL(activated()), this, SLOT(slotDeleteCompleted()) );
 
-    insertItemMenuItems( items );    
+    insertItemMenuItems( items );
 
     // Insert View menu items
     items = new QActionGroup( this, QString::null, false );
-    
+
     m_completedAction = new QAction( QString::null, QWidget::tr("Show completed tasks"),
                                      0, items, 0, true );
     m_completedAction->setOn( showCompleted() );
     connect( m_completedAction, SIGNAL(toggled(bool)), this, SLOT(slotShowCompleted(bool)) );
 
     QAction *a = new QAction( QString::null, QWidget::tr("Show only over-due tasks"),
                               0, items, 0, true );
     a->setOn( showOverDue() );
     connect( a, SIGNAL(toggled(bool)), this, SLOT(slotShowDue(bool)) );
 
     m_showDeadLineAction = new QAction( QString::null, QWidget::tr("Show task deadlines"),
                                         0, items, 0, true );
     m_showDeadLineAction->setOn( showDeadline() );
     connect( m_showDeadLineAction, SIGNAL(toggled(bool)), this, SLOT(slotShowDeadLine(bool)) );
 
     m_showQuickTaskAction = new QAction( QString::null, QWidget::tr("Show quick task bar"),
                                          0, items, 0, true );
     m_showQuickTaskAction->setOn( showQuickTask() );
     connect( m_showQuickTaskAction, SIGNAL(toggled(bool)), this, SLOT(slotShowQuickTask(bool)) );
-    
+
     insertViewMenuItems( items );
 }
 /* m_curCat from Config */
 void MainWindow::initConfig() {
     Config config( "todo" );
     config.setGroup( "View" );
     m_completed =  config.readBoolEntry( "ShowComplete", true );
     m_curCat = config.readEntry( "Category", QString::null );
     m_deadline =  config.readBoolEntry( "ShowDeadLine", true);
     m_overdue = config.readBoolEntry("ShowOverDue", false );
     m_quicktask = config.readBoolEntry("ShowQuickTask", true);
 }
 void MainWindow::initUI() {
     // Create main widget stack
     m_stack = new Opie::Ui::OWidgetStack(this,  "main stack");
     setCentralWidget( m_stack );
     connect( this, SIGNAL(categorySelected(const QString&)),
             this, SLOT(setCategory(const QString&)) );
-    
+
     // Create quick task toolbar
     m_curQuick = new QuickEditImpl( this, m_quicktask );
     addToolBar( (QToolBar *)m_curQuick->widget(), QWidget::tr( "QuickEdit" ),
                 QMainWindow::Top, true );
     m_curQuick->signal()->connect( this, SLOT(slotQuickEntered()) );
 }
 void MainWindow::initViews() {
 
     TableView* tableView = new TableView( this, m_stack );
     QWhatsThis::add( tableView, QWidget::tr( "This is a listing of all current tasks.\n\nThe list displays the following information:\n1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.\n2. Priority - a graphical representation of task priority.  Double-click here to modify.\n3. Description - description of task.  Click here to select the task.\n4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options->'Show task deadlines' from the menu above." ) );
     m_stack->addWidget( tableView,  m_counter++ );
     m_views.append( tableView );
     m_curView = tableView;
     connectBase( tableView );
     /* add QString type + QString configname to
      * the View menu
      * and subdirs for multiple views
      */
 }
 void MainWindow::initEditor() {
     m_curEdit = new Editor();
 }
 void MainWindow::initShow() {
     m_curShow = new TextViewShow(this, this);
@@ -178,59 +179,59 @@ MainWindow::~MainWindow() {
     delete templateManager();
 }
 void MainWindow::connectBase( ViewBase* ) {
     // once templates and signals mix we'll use it again
 }
 QPopupMenu* MainWindow::contextMenu( int , bool /*recur*/ ) {
     return itemContextMenu();
 }
 OPimTodoAccess::List MainWindow::list()const {
     return m_todoMgr.list();
 }
 OPimTodoAccess::List MainWindow::sorted( bool asc, int sortOrder ) {
     int cat = 0;
     if ( m_curCat != tr( "All" ) )
         cat = currentCatId();
     if ( m_curCat == tr( "Unfiled" ) )
         cat = -1;
 
     int filter = OPimTodoAccess::FilterCategory;
 
     if (!m_completed )
         filter |= OPimTodoAccess::DoNotShowCompleted;
     if (m_overdue)
         filter |= OPimTodoAccess::OnlyOverDue;
-    
+
     return m_todoMgr.sorted( asc, sortOrder, filter, cat );
 }
 OPimTodoAccess::List MainWindow::sorted( bool asc, int sortOrder, int addFilter) {
     int cat = 0;
     if ( m_curCat != tr( "All" ) )
         cat = currentCatId();
 
     if ( m_curCat == tr( "Unfiled" ) )
         cat = -1;
-    
+
     return m_todoMgr.sorted(asc, sortOrder, addFilter,  cat );
 }
 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() {
     return m_curShow;
 }
 void MainWindow::slotReload() {
     m_syncing = false;
     m_todoMgr.reload();
     currentView()->updateView( );
     raiseCurrentView();
 }
 void MainWindow::closeEvent( QCloseEvent* e ) {
@@ -277,49 +278,49 @@ void MainWindow::closeEvent( QCloseEvent* e ) {
         config.writeEntry( "ShowOverDue", showOverDue() );
         config.writeEntry( "ShowQuickTask", showQuickTask() );
         /* save templates */
         templateManager()->save();
         e->accept();
         QTimer::singleShot(0, qApp, SLOT(closeAllWindows()) );
     }
 }
 void MainWindow::slotItemNew() {
     NewTaskDlg dlg( templateManager()->templates(), this );
     if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) {
         QString tempName = dlg.tempSelected();
         if ( tempName.isNull() )
             // Create new, blank task
             create();
         else {
             // Create new task from the template selected
             OPimTodo event = templateManager()->templateEvent( tempName );
             event = currentEditor()->edit( this, event );
             if ( currentEditor()->accepted() ) {
                 event.setUid( 1 );
                 handleAlarms( OPimTodo(), event );
                 m_todoMgr.add( event );
                 currentView()->addEvent( event );
-        
+
                 reloadCategories();
             }
             raiseCurrentView();
         }
     }
 }
 void MainWindow::slotItemEdit() {
     slotEdit( currentView()->current() );
 }
 void MainWindow::slotItemDuplicate() {
     if(m_syncing) {
         QMessageBox::warning(this, QWidget::tr("Todo"),
 							 QWidget::tr("Data can not be edited, currently syncing"));
         return;
     }
     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::slotItemDelete() {
@@ -384,49 +385,49 @@ void MainWindow::slotDeleteAll() {
 
     raiseCurrentView();
 }
 void MainWindow::slotDeleteCompleted() {
     if(m_syncing) {
         QMessageBox::warning(this, QWidget::tr("Todo"),
                              QWidget::tr("Data can not be edited, currently syncing"));
         return;
     }
 
     if ( !QPEMessageBox::confirmDelete( this, QWidget::tr( "Todo" ), QWidget::tr("all completed tasks?") ) )
         return;
 
 
     m_todoMgr.removeCompleted();
     currentView()->updateView( );
 }
 /*
  * set the category
  */
 void MainWindow::setCategory( const QString &category ) {
     m_curCat = category;
     if ( m_curCat == tr( "All" ) )
         m_curCat = QString::null;
-    
+
     currentView()->setShowCategory( m_curCat );
     raiseCurrentView();
 }
 void MainWindow::slotShowDeadLine( bool dead) {
     m_deadline = dead;
     currentView()->setShowDeadline( dead );
 }
 void MainWindow::slotShowCompleted( bool show) {
     m_completed = show;
     currentView()->setShowCompleted( m_completed );
 }
 void MainWindow::slotShowQuickTask( bool show ) {
     m_quicktask = show;
     if ( m_quicktask )
         m_curQuick->widget()->show();
     else
         m_curQuick->widget()->hide();
 }
 bool MainWindow::showOverDue()const {
     return m_overdue;
 }
 void MainWindow::setDocument( const QString& fi) {
     DocLnk doc(fi);
     if (doc.isValid() )