1 files changed, 76 insertions, 21 deletions

diff --git a/korganizer/filteredit_base.cpp.emb b/korganizer/filteredit_base.cpp.emb
index 9e32851..505edf6 100644
--- a/korganizer/filteredit_base.cpp.emb
+++ b/korganizer/filteredit_base.cpp.emb
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** Form implementation generated from reading ui file 'filteredit_base.ui'
 **
-** Created: Do Jan 22 23:56:40 2004
+** Created: Fr Jan 21 21:25:30 2005
 **      by: The User Interface Compiler ($Id$)
 **
 ** WARNING! All changes made in this file will be lost!
@@ -13,12 +13,15 @@
 #include <qpushbutton.h>
 #include <qframe.h>
 #include <qbuttongroup.h>
+#include <qapplication.h>
 #include <qradiobutton.h>
 #include <qlistbox.h>
+#include <qlabel.h>
 #include <qcheckbox.h>
 #include <qlayout.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
+#include "tr.h"
 
 /*
  *  Constructs a FilterEdit_base as a child of 'parent', with the
@@ -34,36 +37,78 @@ FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl )
     mCriteriaFrame = new QFrame( this, "mCriteriaFrame" );
     mCriteriaFrame->setFrameShape( QFrame::StyledPanel );
     mCriteriaFrame->setFrameShadow( QFrame::Raised );
-    mCriteriaFrameLayout = new QVBoxLayout( mCriteriaFrame, 11, 6, "mCriteriaFrameLayout"); 
+    mCriteriaFrameLayout = new QVBoxLayout( mCriteriaFrame, 3, 2, "mCriteriaFrameLayout"); 
 
     ButtonGroup1 = new QButtonGroup( mCriteriaFrame, "ButtonGroup1" );
     ButtonGroup1->setColumnLayout(0, Qt::Vertical );
     ButtonGroup1->layout()->setSpacing( 6 );
-    ButtonGroup1->layout()->setMargin( 11 );
-    ButtonGroup1Layout = new QVBoxLayout( ButtonGroup1->layout() );
+    ButtonGroup1->layout()->setMargin( 6 );
+    ButtonGroup1Layout = new QGridLayout( ButtonGroup1->layout() );
     ButtonGroup1Layout->setAlignment( Qt::AlignTop );
 
+    layout4 = new QHBoxLayout( 0, 0, 6, "layout4"); 
+
     mCatShowCheck = new QRadioButton( ButtonGroup1, "mCatShowCheck" );
-    ButtonGroup1Layout->addWidget( mCatShowCheck );
+    layout4->addWidget( mCatShowCheck );
 
     mCatHideCheck = new QRadioButton( ButtonGroup1, "mCatHideCheck" );
-    ButtonGroup1Layout->addWidget( mCatHideCheck );
+    layout4->addWidget( mCatHideCheck );
+
+    mCatEditButton = new QPushButton( ButtonGroup1, "mCatEditButton" );
+    layout4->addWidget( mCatEditButton );
+
+    ButtonGroup1Layout->addLayout( layout4, 0, 0 );
 
     mCatList = new QListBox( ButtonGroup1, "mCatList" );
-    ButtonGroup1Layout->addWidget( mCatList );
 
-    mCatEditButton = new QPushButton( ButtonGroup1, "mCatEditButton" );
-    ButtonGroup1Layout->addWidget( mCatEditButton );
+    ButtonGroup1Layout->addWidget( mCatList, 1, 0 );
     mCriteriaFrameLayout->addWidget( ButtonGroup1 );
 
+    layout7 = new QHBoxLayout( 0, 0, 6, "layout7"); 
+
+    textLabel1 = new QLabel( mCriteriaFrame, "textLabel1" );
+    layout7->addWidget( textLabel1 );
+
     mRecurringCheck = new QCheckBox( mCriteriaFrame, "mRecurringCheck" );
-    mCriteriaFrameLayout->addWidget( mRecurringCheck );
+    layout7->addWidget( mRecurringCheck );
 
     mCompletedCheck = new QCheckBox( mCriteriaFrame, "mCompletedCheck" );
-    mCriteriaFrameLayout->addWidget( mCompletedCheck );
+    layout7->addWidget( mCompletedCheck );
+    mCriteriaFrameLayout->addLayout( layout7 );
+
+    layout9 = new QHBoxLayout( 0, 0, 6, "layout9"); 
+
+    textLabel1_2 = new QLabel( mCriteriaFrame, "textLabel1_2" );
+    layout9->addWidget( textLabel1_2 );
+
+    mEventCheck = new QCheckBox( mCriteriaFrame, "mEventCheck" );
+    layout9->addWidget( mEventCheck );
+
+    mTodoCheck = new QCheckBox( mCriteriaFrame, "mTodoCheck" );
+    layout9->addWidget( mTodoCheck );
+
+    mJournalCheck = new QCheckBox( mCriteriaFrame, "mJournalCheck" );
+    layout9->addWidget( mJournalCheck );
+    mCriteriaFrameLayout->addLayout( layout9 );
+
+    layout2 = new QHBoxLayout( 0, 0, 0, "layout2"); 
+
+    textLabel2 = new QLabel( mCriteriaFrame, "textLabel2" );
+    layout2->addWidget( textLabel2 );
+
+    mPublicCheck = new QCheckBox( mCriteriaFrame, "mPublicCheck" );
+    layout2->addWidget( mPublicCheck );
+
+    mPrivateCheck = new QCheckBox( mCriteriaFrame, "mPrivateCheck" );
+    layout2->addWidget( mPrivateCheck );
+
+    mConfidentialCheck = new QCheckBox( mCriteriaFrame, "mConfidentialCheck" );
+    mConfidentialCheck->setChecked( FALSE );
+    layout2->addWidget( mConfidentialCheck );
+    mCriteriaFrameLayout->addLayout( layout2 );
     FilterEdit_baseLayout->addWidget( mCriteriaFrame );
     languageChange();
-    resize( QSize(196, 257).expandedTo(minimumSizeHint()) );
+    resize( QSize(300, 200).expandedTo(minimumSizeHint()) );
     clearWState( WState_Polished );
 }
 
@@ -83,15 +128,25 @@ void FilterEdit_base::languageChange()
 {
     setCaption( tr( "FilterEditor" ) );
     ButtonGroup1->setTitle( tr( "Categories" ) );
-    mCatShowCheck->setText( tr( "Show only selected" ) );
-    mCatHideCheck->setText( tr( "Show all but selected" ) );
+    mCatShowCheck->setText( tr( "Include" ) );
+    mCatHideCheck->setText( tr( "Exclude" ) );
     mCatEditButton->setText( tr( "Edit Selection..." ) );
-    mRecurringCheck->setText( tr( "Hide recurring events" ) );
-    mCompletedCheck->setText( tr( "Hide completed to-dos" ) );
-}
-
-void FilterEdit_base::updateFilter()
-{
-    qWarning( "FilterEdit_base::updateFilter(): Not implemented yet" );
+    textLabel1->setText( tr( "Exclude" ) );
+    if (QApplication::desktop()->width() > 480 ) {
+        mCompletedCheck->setText( tr( "completed to-dos" ) );
+        mRecurringCheck->setText( tr( "recurring events" ) );
+    }
+    else {
+        mCompletedCheck->setText( tr( "compl.todos" ) );
+        mRecurringCheck->setText( tr( "recurr. events" ) );
+    }
+    textLabel1_2->setText( tr( "Exclude" ) );
+    mEventCheck->setText( tr( "events" ) );
+    mTodoCheck->setText( tr( "todos" ) );
+    mJournalCheck->setText( tr( "journals" ) );
+    textLabel2->setText( tr( "Include" ) );
+    mPublicCheck->setText( tr( "public" ) );
+    mPrivateCheck->setText( tr( "private" ) );
+    mConfidentialCheck->setText( tr( "confidential" ) );
 }