author | zautrix <zautrix> | 2005-01-29 16:41:15 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-29 16:41:15 (UTC) |
commit | 41baa2e15a1ec5e14750297e0a21020c9e53d953 (patch) (side-by-side diff) | |
tree | 2a1a1ae20928d4f2dc3ac73e9be82f04563b3604 /korganizer/koagenda.cpp | |
parent | c6548bb194a5e73b9b72505c2e952ef6346dec46 (diff) | |
download | kdepimpi-41baa2e15a1ec5e14750297e0a21020c9e53d953.zip kdepimpi-41baa2e15a1ec5e14750297e0a21020c9e53d953.tar.gz kdepimpi-41baa2e15a1ec5e14750297e0a21020c9e53d953.tar.bz2 |
fix
-rw-r--r-- | korganizer/koagenda.cpp | 49 |
1 files changed, 27 insertions, 22 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 73ee5cb..0eeacb3 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -168,17 +168,7 @@ KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent, const char *name,WFlags f) : QScrollView(parent,name,f) { - mNewItemPopup = new QPopupMenu( this ); - connect ( mNewItemPopup, SIGNAL (activated ( int ) ), this, SLOT ( newItem(int)) ); - QString pathString = ""; - if ( !KOPrefs::instance()->mToolBarMiniIcons ) { - if ( QApplication::desktop()->width() < 480 ) - pathString += "icons16/"; - } else - pathString += "iconsmini/"; - mNewItemPopup->insertItem ( SmallIcon( pathString +"newevent" ), i18n("New Event..."), 1 ); - mNewItemPopup->insertItem ( SmallIcon( pathString +"newtodo" ), i18n("New Todo..."),2 ); mColumns = columns; mRows = rows; @@ -198,16 +188,6 @@ KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent, KOAgenda::KOAgenda(int columns,QWidget *parent,const char *name,WFlags f) : QScrollView(parent,name,f) { - mNewItemPopup = new QPopupMenu( this ); - connect ( mNewItemPopup, SIGNAL (activated ( int ) ), this, SLOT ( newItem(int)) ); - QString pathString = ""; - if ( !KOPrefs::instance()->mToolBarMiniIcons ) { - if ( QApplication::desktop()->width() < 480 ) - pathString += "icons16/"; - } else - pathString += "iconsmini/"; - mNewItemPopup->insertItem ( SmallIcon( pathString +"newevent" ), i18n("New Event..."),1 ); - mNewItemPopup->insertItem ( SmallIcon( pathString +"newtodo" ), i18n("New Todo..."),2 ); blockResize = false; mColumns = columns; mRows = 1; @@ -242,6 +222,24 @@ QDate KOAgenda::selectedIncidenceDate() const void KOAgenda::init() { + mNewItemPopup = new QPopupMenu( this ); + connect ( mNewItemPopup, SIGNAL (activated ( int ) ), this, SLOT ( newItem(int)) ); + QString pathString = ""; + if ( !KOPrefs::instance()->mToolBarMiniIcons ) { + if ( QApplication::desktop()->width() < 480 ) + pathString += "icons16/"; + } else + pathString += "iconsmini/"; + + mNewItemPopup->insertItem ( SmallIcon( pathString +"newevent" ), i18n("New Event..."), 1 ); + mNewItemPopup->insertItem ( SmallIcon( pathString +"newtodo" ), i18n("New Todo..."),2 ); + mNewItemPopup->insertSeparator ( ); + mNewItemPopup->insertItem ( SmallIcon( pathString +"day" ), i18n("Day view"),3 ); + mNewItemPopup->insertItem ( SmallIcon( pathString +"xdays" ), i18n("Next days"),8 ); + mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ), i18n("Next week"),4 ); + mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ), i18n("Next two weeks"),5 ); + mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ), i18n("Next month"),6 ); + mNewItemPopup->insertItem ( SmallIcon( pathString +"journal" ), i18n("Journal view"),7 ); #ifndef _WIN32_ int wflags = viewport()-> getWFlags() |WRepaintNoErase;//WResizeNoErase viewport()->setWFlags ( wflags); @@ -562,12 +560,19 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) void KOAgenda::newItem( int item ) { - qDebug("new %d ", item); if ( item == 1 ) { //new event newEventSignal(mStartCellX ,mStartCellY ); - } + } else if ( item == 2 ) { //new event newTodoSignal(mStartCellX ,mStartCellY ); + } else + { + QDate day = mSelectedDates[mStartCellX]; + emit showDateView( item, day ); + // 3Day view + // 4Week view + // 5Month view + // 6Journal view } } void KOAgenda::startSelectAction(QPoint viewportPos) |