From kde-commits  Wed Jan 31 22:33:38 2007
From: Oral Timocin <oral.timocin () kdemail ! net>
Date: Wed, 31 Jan 2007 22:33:38 +0000
To: kde-commits
Subject: branches/work/kdepim-3.5.5+/kontact/plugins/planner
Message-Id: <1170282818.112877.10718.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=117028288322992

SVN commit 628915 by timocin:

Update: Config and Functionality of To-dos

 M  +24 -17    branches/work/kdepim-3.5.5+/kontact/plugins/planner/kcmplanner.cpp  


--- branches/work/kdepim-3.5.5+/kontact/plugins/planner/kcmplanner.cpp #628914:628915
@@ -61,8 +61,7 @@
   connect( mTodoGroup, SIGNAL( clicked( int ) ), SLOT( modified() ) );
   connect( mCustomDays, SIGNAL( valueChanged( int ) ), SLOT( modified() ) );
   connect( mCustomDays, SIGNAL( valueChanged( int ) ), SLOT( customDaysChanged( int ) ) );
-  connect( mShowTodaysTodos, SIGNAL ( toggled() ), SLOT( modified() ) );
-  connect( mShowTodaysTodos, SIGNAL ( toggled() ), SLOT( disableAll() ) );
+
   KAcceleratorManager::manage( this );
 
   load();
@@ -92,10 +91,12 @@
   mCustomDays->setSuffix( i18n( " day", " days", value ) );
 }
 
-void KCMPlanner::disableAll()
+void KCMPlanner::disableAll( bool state)
 {
-  mShowAllTodos->setEnabled( true );
-  mShowAllTodos->setChecked( false );
+  mShowTodayEndingTodos->setDisabled( state );
+  mShowTodayEndingTodos->setChecked( false );
+
+  emit changed( true );
 }
 
 /*
@@ -152,13 +153,20 @@
   QVBoxLayout *layout = new QVBoxLayout( mTodoPage,
                                             KDialog::spacingHint() );
 
-  mTodoGroup = new QButtonGroup( 3, Vertical, mTodoPage );
+  mTodoGroup = new QGroupBox( 4, Vertical, mTodoPage );
 
   QLabel *label = new QLabel( i18n( "Which To-dos should be shown?" ), mTodoGroup );
   mShowAllTodos = new QCheckBox( i18n("Show all to-dos" ), mTodoGroup);
-  mShowAllTodos->setEnabled( false );
-  mShowTodaysTodos = new QCheckBox( i18n("Today's to-dos" ), mTodoGroup);
+  mShowTodayEndingTodos = new QCheckBox( i18n("Today ending to-dos" ), mTodoGroup);
+  mShowTodosInProgress = new QCheckBox( i18n("To-dos in progress" ), mTodoGroup);
 
+  connect( mShowAllTodos, SIGNAL( toggled( bool ) ),
+                            SLOT( disableAll( bool ) ) );
+  connect( mShowTodayEndingTodos, SIGNAL( toggled( bool ) ),
+                              SLOT( modified() ) );
+  connect( mShowTodosInProgress, SIGNAL( toggled( bool ) ),
+                              SLOT( modified() ) );
+
   layout->addWidget( mTodoGroup );
   layout->addStretch();
 }
@@ -205,14 +213,10 @@
   }
 
   config.setGroup( "Todo" );
-  bool allTodos = config.readBoolEntry( "ShowAllTodos", false );
+  mShowAllTodos->setChecked( config.readBoolEntry( "ShowAllTodos" ) );
+  mShowTodayEndingTodos->setChecked( config.readBoolEntry( "ShowTodayEndingTodos" ) );
+  mShowTodosInProgress->setChecked( config.readBoolEntry( "ShowTodosInProgress" ) );
 
-  if ( allTodos ) {
-    mTodoGroup->setButton( 0 );
-  } else {
-    mTodoGroup->setButton( 1 );
-  }
-
   emit changed( false );
 }
 
@@ -235,7 +239,8 @@
 
   config.setGroup( "Todo" );
   config.writeEntry( "ShowAllTodos", mShowAllTodos->isChecked() );
-  config.writeEntry( "ShowTodaysTodos", mShowTodaysTodos->isChecked() );
+  config.writeEntry( "ShowTodayEndingTodos", mShowTodayEndingTodos->isChecked() );
+  config.writeEntry( "ShowTodosInProgress", mShowTodosInProgress->isChecked() );
 
   config.sync();
 
@@ -245,7 +250,9 @@
 void KCMPlanner::defaults()
 {
   mCalendarGroup->setButton( 0 );
-  mTodoGroup->setButton( 1 );
+  mShowAllTodos->setChecked( false );
+  mShowTodayEndingTodos->setChecked( true );
+  mShowTodosInProgress->setChecked( true );
 
   emit changed( true );
 }