summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/calendarview.cpp5
-rw-r--r--korganizer/calendarview.h2
-rw-r--r--korganizer/kofilterview.cpp64
-rw-r--r--korganizer/kofilterview.h9
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
@@ -455,12 +455,13 @@ void CalendarView::init()
"CalendarView::DateNavigator", QDate::currentDate());
#endif
// mDateNavigator->blockSignals( true );
//leftFrameLayout->addWidget( mDateNavigator );
mTodoList = new KOTodoView(mCalendar, mLeftFrame, "todolistsmall");
mFilterView = new KOFilterView(&mFilters,mLeftFrame,"CalendarView::FilterView");
+ mCalEditView = new KOCalEditView(mLeftFrame,"CalendarView::CaleditView");
mTodoList->setNavigator( mNavigator );
#if 0
if ( QApplication::desktop()->width() < 480 ) {
leftFrameLayout->addWidget(mFilterView);
leftFrameLayout->addWidget(mTodoList, 2 );
@@ -3905,14 +3906,18 @@ KOFilterView *CalendarView::filterView()
void CalendarView::selectFilter( int fil )
{
mFilterView->setSelectedFilter( 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( )
{
mFilterView->setFiltersEnabled ( !mFilterView->filtersEnabled() );
if ( !mFilterView->filtersEnabled() )
topLevelWidget()->setCaption( i18n("Filter disabled ") );
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 1215a99..cdce072 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -47,12 +47,13 @@
class QWidgetStack;
class QSplitter;
class CalPrinter;
class KOFilterView;
+class KOCalEditView;
class KOViewManager;
class KODialogManager;
class KOTodoView;
class KDateNavigator;
class DateNavigatorContainer;
class DateNavigator;
@@ -563,12 +564,13 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
KDatePicker* mDatePicker;
QVBox* mDateFrame;
DateNavigatorContainer *mDateNavigator; // widget showing small month view.
KOFilterView *mFilterView;
+ KOCalEditView *mCalEditView;
ResourceView *mResourceView;
// calendar object for this viewing instance
Calendar *mCalendar;
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index f0d17b5..64675ad 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -21,17 +21,21 @@
without including the source code for Qt in the source distribution.
*/
#include <qcheckbox.h>
#include <qcombobox.h>
#include <qpushbutton.h>
+#include <qlayout.h>
+#include <qlabel.h>
#include <libkcal/calfilter.h>
#include "kofilterview.h"
+#include <kiconloader.h>
+#include <kglobal.h>
KOFilterView::KOFilterView(QPtrList<CalFilter> *filterList,QWidget* parent,
const char* name,WFlags fl )
: KOFilterView_base(parent,name,fl)
{
mFilters = filterList;
@@ -93,24 +97,80 @@ void KOFilterView::setSelectedFilter( int fil )
emit filterChanged();
}
KOCalEditView::KOCalEditView(QWidget* parent,
- const char* name,WFlags fl )
- : QWidget(parent,name,fl)
+ const char* name )
+ : QWidget(parent,name)
{
/*
connect(mSelectionCombo,SIGNAL(activated(int)),SIGNAL(filterChanged()));
connect(mEnabledCheck,SIGNAL(clicked()),SIGNAL(filterChanged()));
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() );
+
+
+
}
KOCalEditView::~KOCalEditView()
{
// no need to delete child widgets, Qt does it all for us
}
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
@@ -55,17 +55,22 @@ class KOFilterView : public KOFilterView_base
};
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 );
void calendarEnabled ( int cal, bool enable );
void calendarReadonly ( int cal, bool readonly );
void setCalendarDefault ( int cal );
void removeCalendar ( int cal );