-rw-r--r-- | korganizer/calendarview.cpp | 5 | ||||
-rw-r--r-- | korganizer/calendarview.h | 2 | ||||
-rw-r--r-- | korganizer/kofilterview.cpp | 64 | ||||
-rw-r--r-- | korganizer/kofilterview.h | 9 |
4 files changed, 76 insertions, 4 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 2a55127..ea100d1 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -459,4 +459,5 @@ void CalendarView::init() mTodoList = new KOTodoView(mCalendar, mLeftFrame, "todolistsmall"); mFilterView = new KOFilterView(&mFilters,mLeftFrame,"CalendarView::FilterView"); + mCalEditView = new KOCalEditView(mLeftFrame,"CalendarView::CaleditView"); mTodoList->setNavigator( mNavigator ); #if 0 @@ -3909,6 +3910,10 @@ void CalendarView::selectFilter( int fil ) void CalendarView::showFilter(bool visible) { + if (visible) mCalEditView->show(); + else mCalEditView->hide(); +#if 0 if (visible) mFilterView->show(); else mFilterView->hide(); +#endif } void CalendarView::toggleFilerEnabled( ) diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 1215a99..cdce072 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h @@ -51,4 +51,5 @@ class QSplitter; class CalPrinter; class KOFilterView; +class KOCalEditView; class KOViewManager; class KODialogManager; @@ -567,4 +568,5 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser KOFilterView *mFilterView; + KOCalEditView *mCalEditView; ResourceView *mResourceView; diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp index f0d17b5..64675ad 100644 --- a/korganizer/kofilterview.cpp +++ b/korganizer/kofilterview.cpp @@ -25,4 +25,6 @@ #include <qcombobox.h> #include <qpushbutton.h> +#include <qlayout.h> +#include <qlabel.h> @@ -30,4 +32,6 @@ #include "kofilterview.h" +#include <kiconloader.h> +#include <kglobal.h> KOFilterView::KOFilterView(QPtrList<CalFilter> *filterList,QWidget* parent, @@ -97,6 +101,6 @@ void KOFilterView::setSelectedFilter( int fil ) KOCalEditView::KOCalEditView(QWidget* parent, - const char* name,WFlags fl ) - : QWidget(parent,name,fl) + const char* name ) + : QWidget(parent,name) { /* @@ -105,4 +109,40 @@ KOCalEditView::KOCalEditView(QWidget* parent, connect(mEditButton,SIGNAL(clicked()),SIGNAL(editCalEdits())); */ + 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() ); + + + } @@ -115,2 +155,22 @@ 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 @@ -59,9 +59,14 @@ class KOCalEditView : public QWidget Q_OBJECT public: - KOCalEditView( QWidget* parent=0,const char* name=0, WFlags fl=0); + KOCalEditView( QWidget* parent=0,const char* name=0); ~KOCalEditView(); void readConfig( KConfig *); - + public slots: + void addCal(); + void enableAll(); + void enableAlarm(); + void disableRO(); + void deleteAll(); signals: void alarmEnabled ( int cal, bool enable ); |