7 files changed, 78 insertions, 6 deletions

diff --git a/bin/kdepim/korganizer/bell.png b/bin/kdepim/korganizer/bell.png
index 8d2415b..46ab9e3 100644
--- a/bin/kdepim/korganizer/bell.png
+++ b/bin/kdepim/korganizer/bell.png
diff --git a/bin/kdepim/korganizer/icons16/trash.png b/bin/kdepim/korganizer/icons16/trash.png
new file mode 100644
index 0000000..ee5304a
--- a/dev/null
+++ b/bin/kdepim/korganizer/icons16/trash.png
diff --git a/bin/kdepim/korganizer/trash.png b/bin/kdepim/korganizer/trash.png
new file mode 100644
index 0000000..ee5304a
--- a/dev/null
+++ b/bin/kdepim/korganizer/trash.png
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 2a55127..ea100d1 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -459,3 +459,4 @@ void CalendarView::init()
     mTodoList = new KOTodoView(mCalendar, mLeftFrame, "todolistsmall");
-    mFilterView = new KOFilterView(&mFilters,mLeftFrame,"CalendarView::FilterView");
+    mFilterView = new KOFilterView(&mFilters,mLeftFrame,"CalendarView::FilterView"); 
+    mCalEditView = new KOCalEditView(mLeftFrame,"CalendarView::CaleditView");
     mTodoList->setNavigator( mNavigator );
@@ -3910,4 +3911,8 @@ void CalendarView::showFilter(bool visible)
 {
+    if (visible) mCalEditView->show();
+    else mCalEditView->hide();
+#if 0
     if (visible) mFilterView->show();
     else mFilterView->hide();
+#endif
 }
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 1215a99..cdce072 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -52,2 +52,3 @@ class CalPrinter;
 class KOFilterView;
+class KOCalEditView;
 class KOViewManager;
@@ -568,2 +569,3 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     KOFilterView *mFilterView;
+    KOCalEditView *mCalEditView;
 
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index f0d17b5..64675ad 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -26,2 +26,4 @@
 #include <qpushbutton.h>
+#include <qlayout.h>
+#include <qlabel.h>
 
@@ -31,2 +33,4 @@
 #include "kofilterview.h"
+#include <kiconloader.h>
+#include <kglobal.h>
 
@@ -98,4 +102,4 @@ void KOFilterView::setSelectedFilter( int fil )
 KOCalEditView::KOCalEditView(QWidget* parent,
-                           const char* name,WFlags fl )
-  : QWidget(parent,name,fl)
+                           const char* name )
+  : QWidget(parent,name)
 {
@@ -106,2 +110,38 @@ KOCalEditView::KOCalEditView(QWidget* parent,
     */
+    QGridLayout* mainLayout = new QGridLayout ( this , 2, 6 ); 
+    QPushButton * addBut = new QPushButton ( this );
+    mainLayout->addWidget( addBut,0,0 );
+    addBut->setPixmap ( SmallIcon("redcross16"));
+    connect(addBut,SIGNAL(clicked()),SLOT(addCal()));
+    addBut->setMaximumWidth( addBut->sizeHint().height() );
+
+    addBut = new QPushButton ( this );
+    mainLayout->addWidget( addBut,0,1 );
+    addBut->setPixmap ( SmallIcon("redcross16"));
+    connect(addBut,SIGNAL(clicked()),SLOT(enableAll()));
+    addBut->setMaximumWidth( addBut->sizeHint().height() );
+
+    QLabel* lab = new QLabel ( " "+i18n("Calendar")+" ", this );
+    mainLayout->addWidget( lab,0,2 );
+
+    addBut = new QPushButton ( this );
+    mainLayout->addWidget( addBut,0,3 );
+    addBut->setPixmap ( SmallIcon("redcross16"));
+    connect(addBut,SIGNAL(clicked()),SLOT(enableAlarm()));
+    addBut->setMaximumWidth( addBut->sizeHint().height() );
+
+    addBut = new QPushButton ( this );
+    mainLayout->addWidget( addBut,0,4 );
+    addBut->setPixmap ( SmallIcon("redcross16"));
+    connect(addBut,SIGNAL(clicked()),SLOT(disableRO()));
+    addBut->setMaximumWidth( addBut->sizeHint().height() );
+
+    addBut = new QPushButton ( this );
+    mainLayout->addWidget( addBut,0,5 );
+    addBut->setPixmap ( SmallIcon("trash"));
+    connect(addBut,SIGNAL(clicked()),SLOT(deleteAll()));
+    addBut->setMaximumWidth( addBut->sizeHint().height() );
+
+
+
 }
@@ -116 +156,21 @@ void KOCalEditView::readConfig( KConfig *)
 }
+void KOCalEditView::addCal()
+{
+    qDebug("addcal ");
+}
+void KOCalEditView::enableAll()
+{
+    qDebug("enableAll");
+}
+void KOCalEditView::enableAlarm()
+{
+    qDebug("enableAlarm");
+}
+void KOCalEditView::disableRO()
+{
+    qDebug("OCalEditView::disableRO() ");
+}
+void KOCalEditView::deleteAll()
+{
+    qDebug("delteAll");
+}
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h
index 2ac4da1..d434c52 100644
--- a/korganizer/kofilterview.h
+++ b/korganizer/kofilterview.h
@@ -26,3 +26,3 @@
 #include <qstring.h>
-#include <kconfig.h> 
+#include <kconfig.h>
 #include "kofilterview_base.h"
@@ -60,3 +60,3 @@ class KOCalEditView : public QWidget
   public:
-    KOCalEditView( QWidget* parent=0,const char* name=0, WFlags fl=0);
+    KOCalEditView( QWidget* parent=0,const char* name=0);
     ~KOCalEditView();
@@ -64,3 +64,8 @@ class KOCalEditView : public QWidget
     void readConfig( KConfig *);
-
+    public slots:
+    void addCal();
+    void enableAll();
+    void enableAlarm();
+    void disableRO();
+    void deleteAll();
   signals: