← Back to branch summary

~ubuntu-branches/ubuntu/raring/kdepim/raring-proposed

« back to all changes in this revision

Viewing changes to korganizer/filtereditdialog.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-06-07 07:56:38 UTC
  • mfrom: (0.2.27)
  • Revision ID: package-import@ubuntu.com-20120607075638-0luhdq11z7sgvs4m
Tags: 4:4.8.80-0ubuntu1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
korganizer/filtereditdialog.cpp
25
25
*/
26
26
 
27
27
#include "filtereditdialog.h"
28
 
#include "categoryselectdialog.h"
29
28
#include "koprefs.h"
30
29
 
31
30
#include <calendarsupport/categoryconfig.h>
32
31
 
 
32
#include <incidenceeditor-ng/categoryselectdialog.h>
 
33
 
33
34
#include <KCalCore/CalFilter>
34
35
 
35
36
#include <KMessageBox>
36
37
 
37
 
FilterEditDialog::FilterEditDialog( QList<CalFilter*> *filters, QWidget *parent )
 
38
FilterEditDialog::FilterEditDialog( QList<KCalCore::CalFilter*> *filters, QWidget *parent )
38
39
  : KDialog( parent )
39
40
{
40
41
  setCaption( i18nc( "@title::window", "Edit Calendar Filters" ) );
82
83
    enableButtonApply( consistent );
83
84
}
84
85
 
85
 
FilterEdit::FilterEdit( QList<CalFilter*> *filters, QWidget *parent )
 
86
FilterEdit::FilterEdit( QList<KCalCore::CalFilter*> *filters, QWidget *parent )
86
87
  : QWidget( parent ), mCurrent( 0 ), mCategorySelectDialog( 0 )
87
88
{
88
89
  setupUi( this );
127
128
    mDetailsFrame->setEnabled( false );
128
129
    emit( dataConsistent( false ) );
129
130
  } else {
130
 
    QList<CalFilter*>::iterator i;
 
131
    QList<KCalCore::CalFilter*>::iterator i;
131
132
    for ( i = mFilters->begin(); i != mFilters->end(); ++i ) {
132
133
      if ( *i ) {
133
134
        mRulesList->addItem( (*i)->name() );
134
135
      }
135
136
    }
136
137
    if ( mRulesList->currentRow() != -1 ) {
137
 
      CalFilter *f = mFilters->at( mRulesList->currentRow() );
 
138
      KCalCore::CalFilter *f = mFilters->at( mRulesList->currentRow() );
138
139
      if ( f ) {
139
140
        filterSelected( f );
140
141
      }
158
159
  mCurrent->setName( mNameLineEdit->text() );
159
160
  int criteria = 0;
160
161
  if ( mCompletedCheck->isChecked() ) {
161
 
    criteria |= CalFilter::HideCompletedTodos;
 
162
    criteria |= KCalCore::CalFilter::HideCompletedTodos;
162
163
  }
163
164
  if ( mRecurringCheck->isChecked() ) {
164
 
    criteria |= CalFilter::HideRecurring;
 
165
    criteria |= KCalCore::CalFilter::HideRecurring;
165
166
  }
166
167
  if ( mCatShowCheck->isChecked() ) {
167
 
    criteria |= CalFilter::ShowCategories;
 
168
    criteria |= KCalCore::CalFilter::ShowCategories;
168
169
  }
169
170
  if ( mHideInactiveTodosCheck->isChecked() ) {
170
 
    criteria |= CalFilter::HideInactiveTodos;
 
171
    criteria |= KCalCore::CalFilter::HideInactiveTodos;
171
172
  }
172
173
  if ( mHideTodosNotAssignedToMeCheck->isChecked() ) {
173
 
    criteria |= CalFilter::HideNoMatchingAttendeeTodos;
 
174
    criteria |= KCalCore::CalFilter::HideNoMatchingAttendeeTodos;
174
175
  }
175
176
  mCurrent->setCriteria( criteria );
176
177
  mCurrent->setCompletedTimeSpan( mCompletedTimeSpan->value() );
194
195
  }
195
196
}
196
197
 
197
 
void FilterEdit::filterSelected( CalFilter *filter )
 
198
void FilterEdit::filterSelected( KCalCore::CalFilter *filter )
198
199
{
199
200
  if( !filter || filter == mCurrent ) {
200
201
    return;
207
208
  mNameLineEdit->setText( mCurrent->name() );
208
209
  mNameLineEdit->blockSignals( false );
209
210
  mDetailsFrame->setEnabled( true );
210
 
  mCompletedCheck->setChecked( mCurrent->criteria() & CalFilter::HideCompletedTodos );
 
211
  mCompletedCheck->setChecked( mCurrent->criteria() & KCalCore::CalFilter::HideCompletedTodos );
211
212
  mCompletedTimeSpan->setValue( mCurrent->completedTimeSpan() );
212
 
  mRecurringCheck->setChecked( mCurrent->criteria() & CalFilter::HideRecurring );
 
213
  mRecurringCheck->setChecked( mCurrent->criteria() & KCalCore::CalFilter::HideRecurring );
213
214
  mHideInactiveTodosCheck->setChecked(
214
 
    mCurrent->criteria() & CalFilter::HideInactiveTodos );
 
215
    mCurrent->criteria() & KCalCore::CalFilter::HideInactiveTodos );
215
216
  mHideTodosNotAssignedToMeCheck->setChecked(
216
 
    mCurrent->criteria() & CalFilter::HideNoMatchingAttendeeTodos );
 
217
    mCurrent->criteria() & KCalCore::CalFilter::HideNoMatchingAttendeeTodos );
217
218
 
218
 
  if ( mCurrent->criteria() & CalFilter::ShowCategories ) {
 
219
  if ( mCurrent->criteria() & KCalCore::CalFilter::ShowCategories ) {
219
220
    mCatShowCheck->setChecked( true );
220
221
  } else {
221
222
    mCatHideCheck->setChecked( true );
228
229
{
229
230
  mDetailsFrame->setEnabled( true );
230
231
  saveChanges();
231
 
  CalFilter *newFilter = new CalFilter( i18nc( "@label default filter name",
232
 
                                               "New Filter %1", mFilters->count() ) );
 
232
  KCalCore::CalFilter *newFilter =
 
233
    new KCalCore::CalFilter( i18nc( "@label default filter name",
 
234
                                    "New Filter %1", mFilters->count() ) );
233
235
  mFilters->append( newFilter );
234
236
  updateFilterList();
235
237
  mRulesList->setCurrentRow( mRulesList->count() - 1 );
255
257
  }
256
258
 
257
259
  int selected = mRulesList->currentRow();
258
 
  CalFilter *filter = mFilters->at( selected );
 
260
  KCalCore::CalFilter *filter = mFilters->at( selected );
259
261
  mFilters->removeAll( filter );
260
262
  delete filter;
261
263
  mCurrent = 0;
274
276
  mRulesList->blockSignals( false );
275
277
  bool allOk = true;
276
278
 
277
 
  foreach ( CalFilter *i, *mFilters ) {
 
279
  foreach ( KCalCore::CalFilter *i, *mFilters ) {
278
280
    if ( i && i->name().isEmpty() ) {
279
281
      allOk = false;
280
282
    }