| -rw-r--r-- | korganizer/kodaymatrix.cpp | 87 | ||||
| -rw-r--r-- | korganizer/kodaymatrix.h | 1 | ||||
| -rw-r--r-- | korganizer/komonthview.cpp | 3 | ||||
| -rw-r--r-- | korganizer/koprefsdialog.cpp | 13 | ||||
| -rw-r--r-- | korganizer/koviewmanager.cpp | 9 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 13 | ||||
| -rw-r--r-- | korganizer/mainwindow.h | 2 |
7 files changed, 92 insertions, 36 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 17a1d13..df606d0 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -366,18 +366,22 @@ void KODayMatrix::computeEvent(Event *event, int i ) if ( !event->location().isEmpty() ) holiStr += " (" + event->location() + ")"; mHolidays[i] =holiStr ; + eDays.setBit(i); } - if ( event->isBirthday()) { - pDays.setBit(i); - if ( !holiStr.isEmpty() ) - holiStr += "\n"; - holiStr += i18n("Birthday") + ": "+event->summary(); - if ( !event->location().isEmpty() ) - holiStr += " (" + event->location() + ")"; - bDays.setBit(i); - mHolidays[i] =holiStr ; + if ( KOPrefs::instance()->mCurrentDisplayedView != VIEW_T_VIEW && KOPrefs::instance()->mCurrentDisplayedView != VIEW_J_VIEW ) { + if ( event->isBirthday()) { + pDays.setBit(i); + if ( !holiStr.isEmpty() ) + holiStr += "\n"; + holiStr += i18n("Birthday") + ": "+event->summary(); + if ( !event->location().isEmpty() ) + holiStr += " (" + event->location() + ")"; + bDays.setBit(i); + mHolidays[i] =holiStr ; + } } - eDays.setBit(i); + if ( KOPrefs::instance()->mCurrentDisplayedView != VIEW_J_VIEW ) + eDays.setBit(i); } void KODayMatrix::updateViewTimed() { @@ -388,6 +392,7 @@ void KODayMatrix::updateViewTimed() } #if 1 + int i; int timeSpan = NUMDAYS-1; QPtrList<Event> events = mCalendar->events(); @@ -469,22 +474,52 @@ void KODayMatrix::updateViewTimed() pDays.setBit(i); } } - -#if 0 - // insert due todos - QPtrList<Todo> todos = calendar()->todos( ); - Todo *todo; - for(todo = todos.first(); todo; todo = todos.next()) { - //insertTodo( todo ); - if ( todo->hasDueDate() ) { - int day = mStartDate.daysTo( todo->dtDue().date() ); + if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) { + bDays.fill( false); + // insert due todos + QPtrList<Todo> todos = mCalendar->todos( ); + Todo *todo; + for(todo = todos.first(); todo; todo = todos.next()) { + //insertTodo( todo ); + if ( todo->hasDueDate() ) { + int day = mStartDate.daysTo( todo->dtDue().date() ); + if ( day >= 0 && day < timeSpan + 1) { + int i = day; + QString holiStr = mHolidays[i]; + pDays.setBit(i); + if ( !holiStr.isEmpty() ) + holiStr += "\n"; + holiStr += i18n("Todo") + ": "+todo->summary(); + if ( !todo->location().isEmpty() ) + holiStr += " (" + todo->location() + ")"; + bDays.setBit(i); + mHolidays[i] =holiStr ; + eDays.setBit(i); + } + } + } + } + if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) { + bDays.fill( false); + // insert due todos + QPtrList<Journal> todos = mCalendar->journals( ); + Journal *todo; + for(todo = todos.first(); todo; todo = todos.next()) { + int day = mStartDate.daysTo( todo->dtStart().date() ); if ( day >= 0 && day < timeSpan + 1) { - (*cells)[day]->insertTodo( todo ); + int i = day; + QString holiStr = mHolidays[i]; + pDays.setBit(i); + if ( !holiStr.isEmpty() ) + holiStr += "\n"; + holiStr += i18n("Journal"); + bDays.setBit(i); + mHolidays[i] =holiStr ; + eDays.setBit(i); + } } } -#endif - #else //qDebug("KODayMatrix::updateViewTimed "); for(int i = 0; i < NUMDAYS; i++) { @@ -536,7 +571,9 @@ void KODayMatrix::updateViewTimed() } void KODayMatrix::updateView(QDate actdate) { - + if ( mLastView != KOPrefs::instance()->mCurrentDisplayedView ) + mRedrawNeeded = true; + mLastView = KOPrefs::instance()->mCurrentDisplayedView; if ( ! actdate.isValid() ) { //qDebug("date not valid "); return; @@ -1052,9 +1089,9 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) if ( pDays.testBit(i)) { if ( bDays.testBit(i) ) { if ( hDays.testBit(i) ) - p.setPen(QColor(Qt::green)); + p.setPen(QColor(0,200,0)); else - p.setPen(QColor(Qt::green).dark()); + p.setPen(QColor(Qt::blue)); } else { if (actcol == mDefaultTextColor ) { p.setPen(KOPrefs::instance()->mHolidayColor); diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h index b686bd7..a3216d6 100644 --- a/korganizer/kodaymatrix.h +++ b/korganizer/kodaymatrix.h @@ -227,6 +227,7 @@ protected: void resizeEvent(QResizeEvent *); private: + int mLastView; void computeEvent(Event *even, int dayindex ); int oldW, oldH; bool mRedrawNeeded; diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 843526d..ae61db6 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -1557,6 +1557,9 @@ void KOMonthView::updateView() break; } } else { // no recur + if ( !KOPrefs::instance()->mShowSyncEvents && event->uid().left(2) == QString("la") ) + if ( event->uid().left(15) == QString("last-syncEvent-") ) + continue; int st = event->dtStart().date().daysTo( endDate ); if ( st >= 0 ) { // start before timeend int end = mStartDate.daysTo( event->dtEnd().date() ); diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index cb9c272..d9d7924 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -856,10 +856,7 @@ void KOPrefsDialog::setupViewsTab() &(KOPrefs::instance()->mWNViewShowLocation),topFrame); topLayout->addWidget(passwdk->checkBox(), ii++,0); - passwdk = - addWidBool(i18n("Show Sync Events in WN+Agenda"), - &(KOPrefs::instance()->mShowSyncEvents),topFrame); - topLayout->addWidget(passwdk->checkBox(), ii++,0); + passwdk = addWidBool(i18n("Use short date in WN+Event view"), &(KOPrefs::instance()->mShortDateInViewer),topFrame); @@ -952,7 +949,13 @@ dummy = topLayout = new QGridLayout(topFrame,4,1); topLayout->setSpacing(mSpacingHint); topLayout->setMargin(mMarginHint); - ii = 0; + ii = 0; + + dummy = + addWidBool(i18n("Show Sync Events"), + &(KOPrefs::instance()->mShowSyncEvents),topFrame); + topLayout->addWidget(dummy->checkBox(), ii++,0); + lab = new QLabel( i18n("Show in todo/event viewer:"), topFrame); topLayout->addWidget(lab ,ii++,0); diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 3aa9b6c..2e5a943 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -317,6 +317,7 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) //mMainView->updateView(); raiseCurrentView( full, callupdate ); mMainView->adaptNavigationUnits(); + mMainView->updateUnmanagedViews(); } void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView ) @@ -397,6 +398,7 @@ void KOViewManager::showWhatsNextView() mWhatsNextView, SLOT( printMe() ) ); } globalFlagBlockAgenda = 1; + KOPrefs::instance()->mCurrentDisplayedView = VIEW_WN_VIEW; showView(mWhatsNextView, true ); //mWhatsNextView->updateView(); KOPrefs::instance()->mCurrentDisplayedView = VIEW_WN_VIEW; @@ -443,6 +445,7 @@ void KOViewManager::showListView() mMainView->dateNavigator()->selectMonth(); mMainView->setBlockShowDates( false ); } + KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW; showView(mListView, KOPrefs::instance()->mFullViewTodo); //mFlagShowNextxDays = temp; KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW; @@ -510,6 +513,7 @@ void KOViewManager::showAgendaView( bool fullScreen ) mAgendaView->updateConfig(); } + KOPrefs::instance()->mCurrentDisplayedView = VIEW_A_VIEW; showView( mAgendaView, full); KOPrefs::instance()->mCurrentDisplayedView = VIEW_A_VIEW; } @@ -568,6 +572,7 @@ void KOViewManager::showWeekView() void KOViewManager::showNextXView() { + KOPrefs::instance()->mCurrentDisplayedView = VIEW_NX_VIEW; globalFlagBlockAgenda = 1; if ( mCurrentAgendaView != 3 ) mCurrentAgendaView = -1; @@ -655,6 +660,7 @@ if (!mMonthView) { void KOViewManager::showMonthViewWeek() { createMonthView(); + KOPrefs::instance()->mCurrentDisplayedView = VIEW_ML_VIEW ; globalFlagBlockAgenda = 1; bool full = true; if ( mCurrentView == mMonthView) @@ -683,6 +689,7 @@ void KOViewManager::showMonthView() { createMonthView(); + KOPrefs::instance()->mCurrentDisplayedView = VIEW_M_VIEW ; globalFlagBlockAgenda = 1; //mFlagShowNextxDays = false; bool full = true; @@ -754,6 +761,7 @@ void KOViewManager::showTodoView() mTodoView->setNavigator( mMainView->dateNavigator() ); } + KOPrefs::instance()->mCurrentDisplayedView = VIEW_T_VIEW ; globalFlagBlockAgenda = 1; showView( mTodoView, true ); KOPrefs::instance()->mCurrentDisplayedView = VIEW_T_VIEW ; @@ -772,6 +780,7 @@ void KOViewManager::showJournalView() addView(mJournalView); } + KOPrefs::instance()->mCurrentDisplayedView = VIEW_J_VIEW ; showView(mJournalView); mMainView->dateNavigator()->selectDates( 1 ); KOPrefs::instance()->mCurrentDisplayedView = VIEW_J_VIEW ; diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 95bef66..87cef20 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -186,16 +186,19 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : tbd = Left; } filterToolBar = new QPEToolBar ( this ); - filterMenubar = new QPEMenuBar( filterToolBar ); + filterMenubar = new QMenuBar( filterToolBar ); QFontMetrics fm ( filterMenubar->font() ); filterPopupMenu = new QPopupMenu( this ); filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0 ); - QString addTest = "Ax"; + QString addTest = "A"; + filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) ); #ifdef DESKTOP_VERSION - addTest = "AAAx"; -#endif - filterMenubar->setFixedWidth( fm.width( i18n("No Filter")+addTest ) ); + addTest = "AAABBBCCCx"; +#else + addTest = "AAx"; +#endif + filterMenubar->setMaximumWidth( fm.width( i18n("No Filter")+addTest ) ); addToolBar (filterToolBar , tbd ); connect ( filterPopupMenu , SIGNAL( activated ( int ) ), this, SLOT (selectFilterPopup( int ) ) ); connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) ); diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 45ed04d..8fd3d24 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h @@ -123,7 +123,7 @@ class MainWindow : public QMainWindow QPEToolBar *viewToolBar; QPEToolBar *navigatorToolBar; QPEToolBar *filterToolBar; - QPEMenuBar *filterMenubar; + QMenuBar *filterMenubar; QPopupMenu * filterPopupMenu; void initActions(); void setDefaultPreferences(); |