3 files changed, 54 insertions, 2 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index ea100d1..8d992b9 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -470,8 +470,9 @@ void CalendarView::init()
         leftFrameLayout->addWidget(mFilterView );
     } 
 #endif
     mFilterView->hide();
+    mCalEditView->hide();
     QWidget *rightBox = new QWidget( mMainFrame );
     //mainBoxLayout->addWidget ( rightBox, 10 );
     QBoxLayout *rightLayout = new QVBoxLayout( rightBox );
     mRightFrame = new QWidgetStack( rightBox );
@@ -3908,11 +3909,12 @@ void CalendarView::selectFilter( int fil )
     mFilterView->setSelectedFilter( fil );
 }
 void CalendarView::showFilter(bool visible)
 {
+#if 0
     if (visible) mCalEditView->show();
     else mCalEditView->hide();
-#if 0
+#else
     if (visible) mFilterView->show();
     else mFilterView->hide();
 #endif
 }
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index 1bfe4dd..dc6237b 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -137,9 +137,9 @@ KOCalEditView::KOCalEditView(QWidget* parent,
     addBut->setMaximumWidth( addBut->sizeHint().height() );
 
     addBut = new QPushButton ( this );
     mainLayout->addWidget( addBut,0,5 );
-    addBut->setPixmap ( SmallIcon("trash"));
+    addBut->setPixmap ( SmallIcon("minus"));
     connect(addBut,SIGNAL(clicked()),SLOT(deleteAll()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
 
 
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h
index d434c52..060108f 100644
--- a/korganizer/kofilterview.h
+++ b/korganizer/kofilterview.h
@@ -23,8 +23,10 @@
 #ifndef KOFILTERVIEW_H
 #define KOFILTERVIEW_H
 
 #include <qstring.h>
+#include <qcheckbox.h>
+#include <qpushbutton.h>
 #include <kconfig.h>
 #include "kofilterview_base.h"
 
 #include <libkcal/calfilter.h>
@@ -77,7 +79,55 @@ class KOCalEditView : public QWidget
 
   private:
 };
 
+class KOCalButton : public QPushButton
+{
+    Q_OBJECT
+  public:
+    KOCalButton( QWidget *parent=0, const char *name=0 ) :
+      QPushButton( parent, name) 
+    {
+      connect( this, SIGNAL( clicked() ),
+               SLOT( bottonClicked() )); 
+      mNumber = -1;
+    }
+    void setNum ( int num ) {mNumber = num; }
+    signals:
+    void selectNum ( int );
+private: 
+    int mNumber;
+    void keyPressEvent ( QKeyEvent * e )
+    {
+        e->ignore();     
+    }
+
+private slots :
+    void bottonClicked() { if ( mNumber > 0 ) emit selectNum ( mNumber ); }
+};
+class KOCalCheckButton : public QCheckBox
+{
+    Q_OBJECT
+  public:
+    KOCalCheckButton( QWidget *parent=0, const char *name=0 ) :
+      QCheckBox( parent, name) 
+    {
+      connect( this, SIGNAL( toggled ( bool ) ),
+               SLOT( bottonClicked( bool ) )); 
+      mNumber = -1;
+    }
+    void setNum ( int num ) {mNumber = num; }
+    signals:
+    void selectNum ( int, bool );
+private: 
+    int mNumber;
+    void keyPressEvent ( QKeyEvent * e )
+    {
+        e->ignore();     
+    }
+
+private slots :
+    void bottonClicked( bool b) { if ( mNumber > 0 ) emit selectNum ( mNumber , b); }
+};
 
 
 #endif // KOFILTERVIEW_H