author | zautrix <zautrix> | 2005-06-11 06:57:58 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-11 06:57:58 (UTC) |
commit | 53c616e1fe8855211377aab41b3359df5fea456c (patch) (unidiff) | |
tree | 1125bd437738f0bb414486857e14dad6b7bcfa48 /korganizer | |
parent | e7ff7858eb79a452b65b77f8bf5ee108503f432a (diff) | |
download | kdepimpi-53c616e1fe8855211377aab41b3359df5fea456c.zip kdepimpi-53c616e1fe8855211377aab41b3359df5fea456c.tar.gz kdepimpi-53c616e1fe8855211377aab41b3359df5fea456c.tar.bz2 |
fixx
-rw-r--r-- | korganizer/calendarview.cpp | 7 | ||||
-rw-r--r-- | korganizer/calendarview.h | 2 | ||||
-rw-r--r-- | korganizer/kofilterview.cpp | 64 | ||||
-rw-r--r-- | korganizer/kofilterview.h | 11 |
4 files changed, 78 insertions, 6 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 2a55127..ea100d1 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -457,7 +457,8 @@ void CalendarView::init() | |||
457 | // mDateNavigator->blockSignals( true ); | 457 | // mDateNavigator->blockSignals( true ); |
458 | //leftFrameLayout->addWidget( mDateNavigator ); | 458 | //leftFrameLayout->addWidget( mDateNavigator ); |
459 | mTodoList = new KOTodoView(mCalendar, mLeftFrame, "todolistsmall"); | 459 | mTodoList = new KOTodoView(mCalendar, mLeftFrame, "todolistsmall"); |
460 | mFilterView = new KOFilterView(&mFilters,mLeftFrame,"CalendarView::FilterView"); | 460 | mFilterView = new KOFilterView(&mFilters,mLeftFrame,"CalendarView::FilterView"); |
461 | mCalEditView = new KOCalEditView(mLeftFrame,"CalendarView::CaleditView"); | ||
461 | mTodoList->setNavigator( mNavigator ); | 462 | mTodoList->setNavigator( mNavigator ); |
462 | #if 0 | 463 | #if 0 |
463 | if ( QApplication::desktop()->width() < 480 ) { | 464 | if ( QApplication::desktop()->width() < 480 ) { |
@@ -3908,8 +3909,12 @@ void CalendarView::selectFilter( int fil ) | |||
3908 | } | 3909 | } |
3909 | void CalendarView::showFilter(bool visible) | 3910 | void CalendarView::showFilter(bool visible) |
3910 | { | 3911 | { |
3912 | if (visible) mCalEditView->show(); | ||
3913 | else mCalEditView->hide(); | ||
3914 | #if 0 | ||
3911 | if (visible) mFilterView->show(); | 3915 | if (visible) mFilterView->show(); |
3912 | else mFilterView->hide(); | 3916 | else mFilterView->hide(); |
3917 | #endif | ||
3913 | } | 3918 | } |
3914 | void CalendarView::toggleFilerEnabled( ) | 3919 | void CalendarView::toggleFilerEnabled( ) |
3915 | { | 3920 | { |
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 1215a99..cdce072 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -50,6 +50,7 @@ class QSplitter; | |||
50 | 50 | ||
51 | class CalPrinter; | 51 | class CalPrinter; |
52 | class KOFilterView; | 52 | class KOFilterView; |
53 | class KOCalEditView; | ||
53 | class KOViewManager; | 54 | class KOViewManager; |
54 | class KODialogManager; | 55 | class KODialogManager; |
55 | class KOTodoView; | 56 | class KOTodoView; |
@@ -566,6 +567,7 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
566 | DateNavigatorContainer *mDateNavigator; // widget showing small month view. | 567 | DateNavigatorContainer *mDateNavigator; // widget showing small month view. |
567 | 568 | ||
568 | KOFilterView *mFilterView; | 569 | KOFilterView *mFilterView; |
570 | KOCalEditView *mCalEditView; | ||
569 | 571 | ||
570 | ResourceView *mResourceView; | 572 | ResourceView *mResourceView; |
571 | 573 | ||
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp index f0d17b5..64675ad 100644 --- a/korganizer/kofilterview.cpp +++ b/korganizer/kofilterview.cpp | |||
@@ -24,11 +24,15 @@ | |||
24 | #include <qcheckbox.h> | 24 | #include <qcheckbox.h> |
25 | #include <qcombobox.h> | 25 | #include <qcombobox.h> |
26 | #include <qpushbutton.h> | 26 | #include <qpushbutton.h> |
27 | #include <qlayout.h> | ||
28 | #include <qlabel.h> | ||
27 | 29 | ||
28 | 30 | ||
29 | #include <libkcal/calfilter.h> | 31 | #include <libkcal/calfilter.h> |
30 | 32 | ||
31 | #include "kofilterview.h" | 33 | #include "kofilterview.h" |
34 | #include <kiconloader.h> | ||
35 | #include <kglobal.h> | ||
32 | 36 | ||
33 | KOFilterView::KOFilterView(QPtrList<CalFilter> *filterList,QWidget* parent, | 37 | KOFilterView::KOFilterView(QPtrList<CalFilter> *filterList,QWidget* parent, |
34 | const char* name,WFlags fl ) | 38 | const char* name,WFlags fl ) |
@@ -96,14 +100,50 @@ void KOFilterView::setSelectedFilter( int fil ) | |||
96 | 100 | ||
97 | 101 | ||
98 | KOCalEditView::KOCalEditView(QWidget* parent, | 102 | KOCalEditView::KOCalEditView(QWidget* parent, |
99 | const char* name,WFlags fl ) | 103 | const char* name ) |
100 | : QWidget(parent,name,fl) | 104 | : QWidget(parent,name) |
101 | { | 105 | { |
102 | /* | 106 | /* |
103 | connect(mSelectionCombo,SIGNAL(activated(int)),SIGNAL(filterChanged())); | 107 | connect(mSelectionCombo,SIGNAL(activated(int)),SIGNAL(filterChanged())); |
104 | connect(mEnabledCheck,SIGNAL(clicked()),SIGNAL(filterChanged())); | 108 | connect(mEnabledCheck,SIGNAL(clicked()),SIGNAL(filterChanged())); |
105 | connect(mEditButton,SIGNAL(clicked()),SIGNAL(editCalEdits())); | 109 | connect(mEditButton,SIGNAL(clicked()),SIGNAL(editCalEdits())); |
106 | */ | 110 | */ |
111 | QGridLayout* mainLayout = new QGridLayout ( this , 2, 6 ); | ||
112 | QPushButton * addBut = new QPushButton ( this ); | ||
113 | mainLayout->addWidget( addBut,0,0 ); | ||
114 | addBut->setPixmap ( SmallIcon("redcross16")); | ||
115 | connect(addBut,SIGNAL(clicked()),SLOT(addCal())); | ||
116 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | ||
117 | |||
118 | addBut = new QPushButton ( this ); | ||
119 | mainLayout->addWidget( addBut,0,1 ); | ||
120 | addBut->setPixmap ( SmallIcon("redcross16")); | ||
121 | connect(addBut,SIGNAL(clicked()),SLOT(enableAll())); | ||
122 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | ||
123 | |||
124 | QLabel* lab = new QLabel ( " "+i18n("Calendar")+" ", this ); | ||
125 | mainLayout->addWidget( lab,0,2 ); | ||
126 | |||
127 | addBut = new QPushButton ( this ); | ||
128 | mainLayout->addWidget( addBut,0,3 ); | ||
129 | addBut->setPixmap ( SmallIcon("redcross16")); | ||
130 | connect(addBut,SIGNAL(clicked()),SLOT(enableAlarm())); | ||
131 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | ||
132 | |||
133 | addBut = new QPushButton ( this ); | ||
134 | mainLayout->addWidget( addBut,0,4 ); | ||
135 | addBut->setPixmap ( SmallIcon("redcross16")); | ||
136 | connect(addBut,SIGNAL(clicked()),SLOT(disableRO())); | ||
137 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | ||
138 | |||
139 | addBut = new QPushButton ( this ); | ||
140 | mainLayout->addWidget( addBut,0,5 ); | ||
141 | addBut->setPixmap ( SmallIcon("trash")); | ||
142 | connect(addBut,SIGNAL(clicked()),SLOT(deleteAll())); | ||
143 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | ||
144 | |||
145 | |||
146 | |||
107 | } | 147 | } |
108 | 148 | ||
109 | KOCalEditView::~KOCalEditView() | 149 | KOCalEditView::~KOCalEditView() |
@@ -114,3 +154,23 @@ void KOCalEditView::readConfig( KConfig *) | |||
114 | { | 154 | { |
115 | 155 | ||
116 | } | 156 | } |
157 | void KOCalEditView::addCal() | ||
158 | { | ||
159 | qDebug("addcal "); | ||
160 | } | ||
161 | void KOCalEditView::enableAll() | ||
162 | { | ||
163 | qDebug("enableAll"); | ||
164 | } | ||
165 | void KOCalEditView::enableAlarm() | ||
166 | { | ||
167 | qDebug("enableAlarm"); | ||
168 | } | ||
169 | void KOCalEditView::disableRO() | ||
170 | { | ||
171 | qDebug("OCalEditView::disableRO() "); | ||
172 | } | ||
173 | void KOCalEditView::deleteAll() | ||
174 | { | ||
175 | qDebug("delteAll"); | ||
176 | } | ||
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h index 2ac4da1..d434c52 100644 --- a/korganizer/kofilterview.h +++ b/korganizer/kofilterview.h | |||
@@ -24,7 +24,7 @@ | |||
24 | #define KOFILTERVIEW_H | 24 | #define KOFILTERVIEW_H |
25 | 25 | ||
26 | #include <qstring.h> | 26 | #include <qstring.h> |
27 | #include <kconfig.h> | 27 | #include <kconfig.h> |
28 | #include "kofilterview_base.h" | 28 | #include "kofilterview_base.h" |
29 | 29 | ||
30 | #include <libkcal/calfilter.h> | 30 | #include <libkcal/calfilter.h> |
@@ -58,11 +58,16 @@ class KOCalEditView : public QWidget | |||
58 | { | 58 | { |
59 | Q_OBJECT | 59 | Q_OBJECT |
60 | public: | 60 | public: |
61 | KOCalEditView( QWidget* parent=0,const char* name=0, WFlags fl=0); | 61 | KOCalEditView( QWidget* parent=0,const char* name=0); |
62 | ~KOCalEditView(); | 62 | ~KOCalEditView(); |
63 | 63 | ||
64 | void readConfig( KConfig *); | 64 | void readConfig( KConfig *); |
65 | 65 | public slots: | |
66 | void addCal(); | ||
67 | void enableAll(); | ||
68 | void enableAlarm(); | ||
69 | void disableRO(); | ||
70 | void deleteAll(); | ||
66 | signals: | 71 | signals: |
67 | void alarmEnabled ( int cal, bool enable ); | 72 | void alarmEnabled ( int cal, bool enable ); |
68 | void calendarEnabled ( int cal, bool enable ); | 73 | void calendarEnabled ( int cal, bool enable ); |