summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-06-11 06:57:58 (UTC)
committer zautrix <zautrix>2005-06-11 06:57:58 (UTC)
commit53c616e1fe8855211377aab41b3359df5fea456c (patch) (side-by-side diff)
tree1125bd437738f0bb414486857e14dad6b7bcfa48
parente7ff7858eb79a452b65b77f8bf5ee108503f432a (diff)
downloadkdepimpi-53c616e1fe8855211377aab41b3359df5fea456c.zip
kdepimpi-53c616e1fe8855211377aab41b3359df5fea456c.tar.gz
kdepimpi-53c616e1fe8855211377aab41b3359df5fea456c.tar.bz2
fixx
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/bell.pngbin234 -> 639 bytes
-rw-r--r--bin/kdepim/korganizer/icons16/trash.pngbin0 -> 626 bytes
-rw-r--r--bin/kdepim/korganizer/trash.pngbin0 -> 626 bytes
-rw-r--r--korganizer/calendarview.cpp7
-rw-r--r--korganizer/calendarview.h2
-rw-r--r--korganizer/kofilterview.cpp64
-rw-r--r--korganizer/kofilterview.h11
7 files changed, 78 insertions, 6 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
@@ -448,25 +448,26 @@ void CalendarView::init()
topLayout->addWidget( mMainFrame );
//mainBoxLayout->addWidget (mLeftFrame);
mDateNavigator = new DateNavigatorContainer( mLeftFrame,
"CalendarView::DateNavigator" );
#if 0
// FIXME
mDateNavigator = new KDateNavigator(mLeftFrame, mCalendar, TRUE,
"CalendarView::DateNavigator", QDate::currentDate());
#endif
// mDateNavigator->blockSignals( true );
//leftFrameLayout->addWidget( mDateNavigator );
mTodoList = new KOTodoView(mCalendar, mLeftFrame, "todolistsmall");
- mFilterView = new KOFilterView(&mFilters,mLeftFrame,"CalendarView::FilterView");
+ 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 );
} else {
leftFrameLayout->addWidget(mTodoList,2 );
leftFrameLayout->addWidget(mFilterView );
}
#endif
mFilterView->hide();
@@ -3899,26 +3900,30 @@ void CalendarView::toggleFilter()
}
KOFilterView *CalendarView::filterView()
{
return mFilterView;
}
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 ") );
}
void CalendarView::updateFilter()
{
CalFilter *filter = mFilterView->selectedFilter();
if (filter) {
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 1215a99..cdce072 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -41,24 +41,25 @@
#include <libkcal/resourcecalendar.h>
#include <KDGanttMinimizeSplitter.h>
#include <korganizer/calendarviewbase.h>
#include <ksyncmanager.h>
class QWidgetStack;
class QSplitter;
class CalPrinter;
class KOFilterView;
+class KOCalEditView;
class KOViewManager;
class KODialogManager;
class KOTodoView;
class KDateNavigator;
class DateNavigatorContainer;
class DateNavigator;
class KOIncidenceEditor;
class KDatePicker;
class ResourceView;
class KOEventEditor;
class KOTodoEditor ;
class KOEventViewerDialog;
@@ -557,24 +558,25 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
QSplitter *mPanner;
QSplitter *mLeftSplitter;
KDGanttMinimizeSplitter *mLeftFrame, *mMainFrame;
QWidgetStack *mRightFrame;
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;
CalendarResourceManager *mResourceManager;
FileStorage *mStorage;
DateNavigator *mNavigator;
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index f0d17b5..64675ad 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -15,29 +15,33 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
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;
connect(mSelectionCombo,SIGNAL(activated(int)),SIGNAL(filterChanged()));
connect(mEnabledCheck,SIGNAL(clicked()),SIGNAL(filterChanged()));
connect(mEditButton,SIGNAL(clicked()),SIGNAL(editFilters()));
}
@@ -87,30 +91,86 @@ void KOFilterView::setSelectedFilter(QString filterName)
}
void KOFilterView::setSelectedFilter( int fil )
{
if ( fil >= mSelectionCombo->count() )
return;
mSelectionCombo->setCurrentItem( 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
@@ -15,25 +15,25 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
*/
#ifndef KOFILTERVIEW_H
#define KOFILTERVIEW_H
#include <qstring.h>
-#include <kconfig.h>
+#include <kconfig.h>
#include "kofilterview_base.h"
#include <libkcal/calfilter.h>
using namespace KCal;
class KOFilterView : public KOFilterView_base
{
Q_OBJECT
public:
KOFilterView(QPtrList<CalFilter> *filterList,QWidget* parent=0,const char* name=0, WFlags fl=0);
~KOFilterView();
@@ -49,29 +49,34 @@ class KOFilterView : public KOFilterView_base
signals:
void filterChanged();
void editFilters();
private:
QPtrList<CalFilter> *mFilters;
};
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 );
private:
};