-rw-r--r-- | bin/kdepim/korganizer/bell.png | bin | 234 -> 639 bytes | |||
-rw-r--r-- | bin/kdepim/korganizer/icons16/trash.png | bin | 0 -> 626 bytes | |||
-rw-r--r-- | bin/kdepim/korganizer/trash.png | bin | 0 -> 626 bytes | |||
-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 |
7 files changed, 76 insertions, 4 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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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() | |||
455 | "CalendarView::DateNavigator", QDate::currentDate()); | 455 | "CalendarView::DateNavigator", QDate::currentDate()); |
456 | #endif | 456 | #endif |
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 ) { |
464 | leftFrameLayout->addWidget(mFilterView); | 465 | leftFrameLayout->addWidget(mFilterView); |
465 | leftFrameLayout->addWidget(mTodoList, 2 ); | 466 | leftFrameLayout->addWidget(mTodoList, 2 ); |
466 | 467 | ||
@@ -3905,14 +3906,18 @@ KOFilterView *CalendarView::filterView() | |||
3905 | void CalendarView::selectFilter( int fil ) | 3906 | void CalendarView::selectFilter( int fil ) |
3906 | { | 3907 | { |
3907 | mFilterView->setSelectedFilter( fil ); | 3908 | mFilterView->setSelectedFilter( 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 | { |
3916 | mFilterView->setFiltersEnabled ( !mFilterView->filtersEnabled() ); | 3921 | mFilterView->setFiltersEnabled ( !mFilterView->filtersEnabled() ); |
3917 | if ( !mFilterView->filtersEnabled() ) | 3922 | if ( !mFilterView->filtersEnabled() ) |
3918 | topLevelWidget()->setCaption( i18n("Filter disabled ") ); | 3923 | 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 @@ | |||
47 | 47 | ||
48 | class QWidgetStack; | 48 | class QWidgetStack; |
49 | class QSplitter; | 49 | 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; |
56 | class KDateNavigator; | 57 | class KDateNavigator; |
57 | class DateNavigatorContainer; | 58 | class DateNavigatorContainer; |
58 | class DateNavigator; | 59 | class DateNavigator; |
@@ -563,12 +564,13 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
563 | KDatePicker* mDatePicker; | 564 | KDatePicker* mDatePicker; |
564 | QVBox* mDateFrame; | 565 | QVBox* mDateFrame; |
565 | 566 | ||
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 | ||
572 | // calendar object for this viewing instance | 574 | // calendar object for this viewing instance |
573 | Calendar *mCalendar; | 575 | Calendar *mCalendar; |
574 | 576 | ||
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 @@ | |||
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
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 ) |
35 | : KOFilterView_base(parent,name,fl) | 39 | : KOFilterView_base(parent,name,fl) |
36 | { | 40 | { |
37 | mFilters = filterList; | 41 | mFilters = filterList; |
@@ -93,24 +97,80 @@ void KOFilterView::setSelectedFilter( int fil ) | |||
93 | emit filterChanged(); | 97 | emit filterChanged(); |
94 | } | 98 | } |
95 | 99 | ||
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() |
110 | { | 150 | { |
111 | // no need to delete child widgets, Qt does it all for us | 151 | // no need to delete child widgets, Qt does it all for us |
112 | } | 152 | } |
113 | void KOCalEditView::readConfig( KConfig *) | 153 | 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 | |||
@@ -55,17 +55,22 @@ class KOFilterView : public KOFilterView_base | |||
55 | }; | 55 | }; |
56 | 56 | ||
57 | class KOCalEditView : public QWidget | 57 | 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 ); |
69 | void calendarReadonly ( int cal, bool readonly ); | 74 | void calendarReadonly ( int cal, bool readonly ); |
70 | void setCalendarDefault ( int cal ); | 75 | void setCalendarDefault ( int cal ); |
71 | void removeCalendar ( int cal ); | 76 | void removeCalendar ( int cal ); |