summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/calendarview.cpp4
-rw-r--r--korganizer/kotodoview.cpp24
-rw-r--r--korganizer/kotodoviewitem.cpp64
3 files changed, 74 insertions, 18 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 7044e90..f9685e9 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -369,3 +369,3 @@ void CalendarView::init()
mNextAlarmDateTime = QDateTime::currentDateTime();
- setFocusPolicy ( NoFocus );
+ //setFocusPolicy ( NoFocus );
mViewerCallerIsSearchDialog = false;
@@ -4689,3 +4689,3 @@ void CalendarView::keyPressEvent ( QKeyEvent *e)
{
- //qDebug(" alendarView::keyPressEvent ");
+ //qDebug("CalendarView::keyPressEvent ");
e->ignore();
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index add1819..94f35e6 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -434,2 +434,3 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e )
+ e->accept();
return;
@@ -442,2 +443,3 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e )
QListView::keyPressEvent ( e );
+ e->accept();
break;
@@ -516,3 +518,9 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
quickLayout->addWidget( mQuickAdd );
+ mNewSubBut = new QPushButton( "sub",mQuickBar );
+ QPushButton * s_done = new QPushButton( "D",mQuickBar );
+ QPushButton * s_run = new QPushButton( "R",mQuickBar );
+ QPushButton * allopen = new QPushButton( "O",mQuickBar );
+ QPushButton * allclose = new QPushButton( "C",mQuickBar );
QPushButton * flat = new QPushButton( "F",mQuickBar );
+
int fixwid = flat->sizeHint().height();
@@ -522,9 +530,6 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
connect ( flat, SIGNAL ( clicked()), SLOT ( setAllFlat()));
- QPushButton * allopen = new QPushButton( "O",mQuickBar );
allopen->setFixedWidth( fixwid );
connect ( allopen, SIGNAL ( clicked()), SLOT ( setAllOpen()));
- QPushButton * allclose = new QPushButton( "C",mQuickBar );
allclose->setFixedWidth( fixwid );
connect ( allclose, SIGNAL ( clicked()), SLOT ( setAllClose()));
- QPushButton * s_done = new QPushButton( "D",mQuickBar );
s_done->setPixmap( SmallIcon("greenhook16"));
@@ -533,3 +538,2 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
connect ( s_done, SIGNAL ( clicked()), SLOT ( toggleCompleted()));
- QPushButton * s_run = new QPushButton( "R",mQuickBar );
s_run->setPixmap( SmallIcon("ko16old"));
@@ -539,3 +543,2 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
- mNewSubBut = new QPushButton( "sub",mQuickBar );
mNewSubBut->setFixedWidth( fixwid*3/2 );
@@ -577,5 +580,8 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
- mTodoListView->addColumn(i18n("Cancelled"));
+ //mTodoListView->addColumn(i18n("Cancelled"));
mTodoListView->addColumn(i18n("Categories"));
mTodoListView->addColumn(i18n("Calendar"));
+ mTodoListView->addColumn(i18n("Last Modified"));
+ mTodoListView->addColumn(i18n("Created"));
+ mTodoListView->addColumn(i18n("Last Modified Sub"));
#if 0
@@ -590,3 +596,3 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
int iii = 0;
- for ( iii = 0; iii< 10 ; ++iii )
+ for ( iii = 0; iii< 12 ; ++iii )
mTodoListView->setColumnWidthMode( iii, QListView::Manual );
@@ -1605,3 +1611,2 @@ void KOTodoView::keyPressEvent ( QKeyEvent * e )
//return;
- //qDebug("KOTodoView::keyPressEvent ");
if ( !isVisible() ) {
@@ -1613,3 +1618,4 @@ void KOTodoView::keyPressEvent ( QKeyEvent * e )
case Qt::Key_Up:
- QWidget::keyPressEvent ( e );
+ // KOrg::BaseView::keyPressEvent ( e );
+ e->ignore();
break;
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 0cf6e4c..bdef94c 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -155,5 +155,21 @@ void KOTodoViewItem::construct()
- setText(7,mTodo->cancelled() ? i18n("Yes") : i18n("No"));
- setText(8,mTodo->categoriesStr());
- setText(9,KOPrefs::instance()->calName( mTodo->calID()));
+ //setText(7,mTodo->cancelled() ? i18n("Yes") : i18n("No"));
+ setText(7,mTodo->categoriesStr());
+ setText(8,KOPrefs::instance()->calName( mTodo->calID()));
+ setText(9, KGlobal::locale()->formatDateTime( mTodo->lastModified(), true, true ));
+ setText(10, KGlobal::locale()->formatDateTime( mTodo->created(), true, true ));
+ setText(11, KGlobal::locale()->formatDateTime( mTodo->lastModifiedSub(), true, true ));
+ QString key;
+ QDate d = mTodo->lastModified().date();
+ QTime t = mTodo->lastModified().time();
+ key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),t.hour(),t.minute(),t.second() );
+ setSortKey(9,key);
+ d = mTodo->created().date();
+ t = mTodo->created().time();
+ key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),t.hour(),t.minute(),t.second() );
+ setSortKey(10,key);
+ d = mTodo->lastModifiedSub().date();
+ t = mTodo->lastModifiedSub().time();
+ key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),t.hour(),t.minute(),t.second() );
+ setSortKey(11,key);
@@ -319,8 +335,40 @@ bool KOTodoViewItem::isAlternate()
{
-
+#if 0
+ //if ( m_known ) return m_odd;
+ //qDebug("test ");
+ KOTodoViewItem *item = static_cast<KOTodoViewItem *>(itemAbove());
+ if ( item ) {
+ m_known = item->m_known;
+ if ( m_known ) {
+ m_odd = !item->m_odd ;
+ return m_odd;
+ }
+ } else {
+ item = static_cast<KOTodoViewItem *>(itemBelow());
+ if ( item ) {
+ m_known = item->m_known;
+ if ( m_known ) {
+ m_odd = !item->m_odd ;
+ return m_odd;
+ }
+ }
+ }
KOTodoListView *lv = static_cast<KOTodoListView *>(listView());
- if (lv && lv->alternateBackground().isValid())
+ item = static_cast<KOTodoViewItem *>(lv->firstChild());
+ bool previous = true;
+ qDebug("WHILE ");
+ while ( item ) {
+ item->m_odd = !previous;
+ item->m_known = true;
+ previous = !previous;
+ item = static_cast<KOTodoViewItem *>(item->itemBelow());
+ }
+ return m_odd;
+
+#else
+
+ //KOTodoListView *lv = static_cast<KOTodoListView *>(listView());
+ //if (lv && lv->alternateBackground().isValid())
{
- KOTodoViewItem *above = 0;
- above = static_cast<KOTodoViewItem *>(itemAbove());
+ KOTodoViewItem *above = static_cast<KOTodoViewItem *>(itemAbove());
m_known = above ? above->m_known : true;
@@ -343,2 +391,3 @@ bool KOTodoViewItem::isAlternate()
{
+ KOTodoListView *lv = static_cast<KOTodoListView *>(listView());
item = static_cast<KOTodoViewItem *>(lv->firstChild());
@@ -356,2 +405,3 @@ bool KOTodoViewItem::isAlternate()
return false;
+#endif
}