summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/calendarview.cpp4
-rw-r--r--korganizer/kofilterview.cpp2
-rw-r--r--korganizer/kofilterview.h50
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
@@ -468,12 +468,13 @@ void CalendarView::init()
} else {
leftFrameLayout->addWidget(mTodoList,2 );
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 );
rightLayout->addWidget( mRightFrame, 10 );
@@ -3906,15 +3907,16 @@ KOFilterView *CalendarView::filterView()
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
}
void CalendarView::toggleFilerEnabled( )
{
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index 1bfe4dd..dc6237b 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -135,13 +135,13 @@ KOCalEditView::KOCalEditView(QWidget* parent,
addBut->setPixmap ( SmallIcon("pencil"));
connect(addBut,SIGNAL(clicked()),SLOT(disableRO()));
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
@@ -21,12 +21,14 @@
without including the source code for Qt in the source distribution.
*/
#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>
using namespace KCal;
@@ -75,9 +77,57 @@ class KOCalEditView : public QWidget
void setCalendarDefault ( int cal );
void removeCalendar ( int cal );
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