summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt8
-rw-r--r--korganizer/calendarview.cpp4
-rw-r--r--korganizer/koagendaitem.cpp2
-rw-r--r--korganizer/kodialogmanager.cpp2
-rw-r--r--korganizer/koprefs.cpp2
-rw-r--r--korganizer/koprefs.h2
-rw-r--r--korganizer/koprefsdialog.cpp13
-rw-r--r--korganizer/kotodoview.cpp78
-rw-r--r--korganizer/kotodoview.h7
-rw-r--r--korganizer/kotodoviewitem.cpp33
-rw-r--r--korganizer/koviewmanager.cpp1
-rw-r--r--version2
12 files changed, 124 insertions, 30 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index ec75fad..bfe87f0 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,4 +1,12 @@
Info about the changes in new versions of KDE-Pim/Pi
+********** VERSION 1.9.16 ************
+
+KO/Pi:
+Fixed search dialog size on Z 6000 (480x640 display).
+Added setting to hide/show time in agenda items.
+Added setting to hide not running todos in todo view.
+Added columns for start date/time in todo view.
+
********** VERSION 1.9.15 ************
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index a46cd87..7ddbe23 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -267,4 +267,5 @@ void CalendarView::init()
mLeftSplitter->setResizeMode(mDateNavigator,QSplitter::KeepSize);
mTodoList = new KOTodoView(mCalendar, mLeftSplitter, "todolist_small2");
+ mTodoList->setNavigator( mNavigator );
mFilterView = new KOFilterView(&mFilters,mLeftSplitter,"CalendarView::FilterView");
@@ -312,4 +313,5 @@ void CalendarView::init()
mFilterView = new KOFilterView(&mFilters,leftFrame,"CalendarView::FilterView");
mTodoList = new KOTodoView(mCalendar, leftFrame, "todolistsmall");
+ mTodoList->setNavigator( mNavigator );
if ( QApplication::desktop()->width() < 480 ) {
@@ -2145,4 +2147,6 @@ void CalendarView::updateView()
// We assume that the navigator only selects consecutive days.
updateView( tmpList.first(), tmpList.last() );
+ if ( KOPrefs::instance()->mHideNonStartedTodos )
+ mTodoList->updateView();
}
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 46184ac..6965ba7 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -499,5 +499,5 @@ void KOAgendaItem::computeText()
} else {
- if ( !(mIncidence->doesFloat()))
+ if ( !(mIncidence->doesFloat()) && KOPrefs::instance()->mShowTimeInAgenda)
mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtStart().time()) + "-" + KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtEnd().time()) ;
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index db7c3f2..c99c0cb 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -192,5 +192,5 @@ void KODialogManager::showSearchDialog()
// mMainView, SLOT( processMainViewSelection( Incidence * ) ) );
#ifndef DESKTOP_VERSION
- mSearchDialog->setMaximumSize( 640, 480 );
+ mSearchDialog->setMaximumSize( QApplication::desktop()->size());
//mSearchDialog->setGeometry( 40,40, 400, 300);
mSearchDialog->showMaximized();
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 1cdb2fb..aae4692 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -111,4 +111,6 @@ KOPrefs::KOPrefs() :
addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true);
+ addItemBool("ShowTimeInAgenda",&mShowTimeInAgenda,true);
+ addItemBool("HideNonStartedTodos",&mHideNonStartedTodos,false);
addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true);
addItemInt("AllDay Size",&mAllDaySize,28);
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index f2fe77a..69722a1 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -191,4 +191,6 @@ class KOPrefs : public KPimPrefs
bool mShowSyncEvents;
bool mShowTodoInAgenda;
+ bool mShowTimeInAgenda;
+ bool mHideNonStartedTodos;
int mLastSyncTime;
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 578c0e9..8aa24ee 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -94,4 +94,7 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
//setupGroupSchedulingTab();
//setupGroupAutomationTab();
+
+ if ( QApplication::desktop()->height() == 480 )
+ hideButtons();
}
@@ -603,4 +606,9 @@ void KOPrefsDialog::setupViewsTab()
dummy =
+ addWidBool(i18n("Show time in agenda items"),
+ &(KOPrefs::instance()->mShowTimeInAgenda),topFrame);
+ topLayout->addWidget(dummy->checkBox(),ii++,0);
+
+ dummy =
addWidBool(i18n("Highlight current day in agenda"),
&(KOPrefs::instance()->mHighlightCurrentDay),topFrame);
@@ -834,4 +842,9 @@ void KOPrefsDialog::setupViewsTab()
topLayout->setMargin(marginHint());
ii = 0;
+dummy =
+ addWidBool(i18n("Hide not running Todos in To-do view"),
+ &(KOPrefs::instance()->mHideNonStartedTodos),topFrame);
+ topLayout->addWidget(dummy->checkBox(),ii++,0);
+
KPrefsDialogWidBool *showCompletedTodo =
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 9cafc60..5d7b066 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -333,4 +333,5 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
KOrg::BaseView(calendar,parent,name)
{
+ mNavigator = 0;
QBoxLayout *topLayout = new QVBoxLayout(this);
mName = QString ( name );
@@ -353,9 +354,16 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
mTodoListView->setColumnAlignment(1,AlignHCenter);
mTodoListView->addColumn(i18n("Complete"));
- mTodoListView->setColumnAlignment(2,AlignHCenter);
+ mTodoListView->setColumnAlignment(2,AlignCenter);
+
mTodoListView->addColumn(i18n("Due Date"));
mTodoListView->setColumnAlignment(3,AlignLeft);
mTodoListView->addColumn(i18n("Due Time"));
mTodoListView->setColumnAlignment(4,AlignHCenter);
+
+ mTodoListView->addColumn(i18n("Start Date"));
+ mTodoListView->setColumnAlignment(5,AlignLeft);
+ mTodoListView->addColumn(i18n("Start Time"));
+ mTodoListView->setColumnAlignment(6,AlignHCenter);
+
mTodoListView->addColumn(i18n("Cancelled"));
mTodoListView->addColumn(i18n("Categories"));
@@ -376,8 +384,7 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
mTodoListView->setColumnWidthMode(5, QListView::Manual);
mTodoListView->setColumnWidthMode(6, QListView::Manual);
- mTodoListView->setColumnAlignment( 2, AlignCenter );
-#if 0
- mTodoListView->setColumnWidthMode(6, QListView::Manual);
-#endif
+ mTodoListView->setColumnWidthMode(7, QListView::Manual);
+ mTodoListView->setColumnWidthMode(8, QListView::Manual);
+
mPriorityPopupMenu = new QPopupMenu(this);
@@ -429,4 +436,6 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
mItemPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"),
this, SLOT( toggleQuickTodo() ),0, 34 );
+ mItemPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"),
+ this, SLOT( toggleRunning() ),0, 35 );
mPopupMenu = new QPopupMenu(this);
@@ -439,8 +448,22 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
mPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"),
this, SLOT( toggleQuickTodo() ),0,4 );
+ mPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"),
+ this, SLOT( toggleRunning() ),0,5 );
mDocPrefs = new DocPrefs( name );
mPopupMenu->setCheckable( true );
mItemPopupMenu->setCheckable( true );
+
+
+ mPopupMenu->setItemChecked( 3,KOPrefs::instance()->mShowCompletedTodo );
+ mItemPopupMenu->setItemChecked( 33 , KOPrefs::instance()->mShowCompletedTodo );
+
+ mPopupMenu->setItemChecked(4,KOPrefs::instance()->mEnableQuickTodo);
+ mItemPopupMenu->setItemChecked( 34 , KOPrefs::instance()->mEnableQuickTodo );
+
+ mPopupMenu->setItemChecked(5,KOPrefs::instance()->mHideNonStartedTodos);
+ mItemPopupMenu->setItemChecked( 35 , KOPrefs::instance()->mHideNonStartedTodos );
+
+
// Double clicking conflicts with opening/closing the subtree
connect( mTodoListView, SIGNAL( doubleClicked( QListViewItem *) ),
@@ -477,9 +500,4 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
connect( mQuickAdd, SIGNAL( returnPressed () ),
SLOT( addQuickTodo() ) );
-// if ( QApplication::desktop()->width() < 480 ) {
-// setNarrow();
- // mTodoListView->setColumnWidth( 0, 100 );
-
- // }
}
@@ -498,14 +516,4 @@ void KOTodoView::jumpToDate ()
}
-void KOTodoView::setNarrow()
-{
- //mTodoListView->setColumnWidth( 0, 120 );
- mTodoListView->setColumnWidth( 1, 35 );
- mTodoListView->setColumnWidth( 2, 40 );
- mTodoListView->setColumnWidth( 3, 80 );
- mTodoListView->setColumnWidth( 4, 40 );
- mTodoListView->setColumnWidth( 5, 90 );
-
-}
void KOTodoView::updateView()
{
@@ -588,5 +596,5 @@ void KOTodoView::updateView()
//qDebug("for ");
for(todo = todoList.first(); todo; todo = todoList.next()) {
- if (!mTodoMap.contains(todo) && ( KOPrefs::instance()->mShowCompletedTodo || !todo->isCompleted() ) )
+ if (!mTodoMap.contains(todo) && checkTodo( todo ) )
{
insertTodoItem(todo);
@@ -602,4 +610,20 @@ void KOTodoView::updateView()
}
+bool KOTodoView::checkTodo( Todo * todo )
+{
+
+ if ( !KOPrefs::instance()->mShowCompletedTodo && todo->isCompleted() )
+ return false;
+ if ( KOPrefs::instance()->mHideNonStartedTodos && mNavigator ) {
+ if ( todo->hasStartDate() )
+ if ( mNavigator->selectedDates().last() < todo->dtStart().date() )
+ return false;
+ if ( todo->hasDueDate() )
+ if ( mNavigator->selectedDates().first() > todo->dtDue().date() )
+ return false;
+ }
+ return true;
+}
+
void KOTodoView::restoreItemState( QListViewItem *item )
{
@@ -617,4 +641,5 @@ QMap<Todo *,KOTodoViewItem *>::ConstIterator
KOTodoView::insertTodoItem(Todo *todo)
{
+
// kdDebug() << "KOTodoView::insertTodoItem(): " << todo->getSummary() << endl;
// TODO: Check, if dynmaic cast is necessary
@@ -719,5 +744,5 @@ void KOTodoView::popupMenu(QListViewItem *item,const QPoint &,int column)
moveTodo();
break;
- case 6:
+ case 8:
getCategoryPopupMenu((KOTodoViewItem *)item)->popup(QCursor::pos ()); break;
default:
@@ -996,4 +1021,13 @@ void KOTodoView::toggleQuickTodo()
mItemPopupMenu->setItemChecked( 34 , KOPrefs::instance()->mEnableQuickTodo );
}
+
+void KOTodoView::toggleRunning()
+{
+ KOPrefs::instance()->mHideNonStartedTodos = !KOPrefs::instance()->mHideNonStartedTodos;
+ mPopupMenu->setItemChecked(5,KOPrefs::instance()->mHideNonStartedTodos);
+ mItemPopupMenu->setItemChecked( 35 , KOPrefs::instance()->mHideNonStartedTodos );
+ updateView();
+}
+
void KOTodoView::toggleCompleted()
{
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index 0c08677..5ca0362 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -44,4 +44,5 @@
#include "koprefs.h"
#include "koglobals.h"
+#include "datenavigator.h"
class QDragEnterEvent;
@@ -119,5 +120,4 @@ class KOTodoView : public KOrg::BaseView
/** Return number of shown dates. TodoView does not show dates, */
int currentDateCount() { return 0; }
- void setNarrow();
void printPreview(CalPrinter *calPrinter, const QDate &fd, const QDate &td);
@@ -129,4 +129,5 @@ class KOTodoView : public KOrg::BaseView
/** Create a popup menu to set categories */
QPopupMenu *getCategoryPopupMenu (KOTodoViewItem *todoItem);
+ void setNavigator( DateNavigator* nav ) {mNavigator = nav;}
public slots:
@@ -163,4 +164,5 @@ class KOTodoView : public KOrg::BaseView
void purgeCompleted();
void toggleCompleted();
+ void toggleRunning();
void toggleQuickTodo();
void updateTodo( Todo *, int );
@@ -208,4 +210,6 @@ class KOTodoView : public KOrg::BaseView
void restoreItemState( QListViewItem * );
+ bool checkTodo( Todo * );
+
KOTodoListView *mTodoListView;
QPopupMenu *mItemPopupMenu;
@@ -230,4 +234,5 @@ class KOTodoView : public KOrg::BaseView
void keyPressEvent ( QKeyEvent * ) ;
KOTodoViewItem * pendingSubtodo;
+ DateNavigator* mNavigator;
};
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index ae0b334..347d982 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -80,4 +80,6 @@ void KOTodoViewItem::construct()
QString keyd = "==";
QString keyt = "==";
+ QString skeyd = "==";
+ QString skeyt = "==";
setOn(mTodo->isCompleted());
@@ -97,5 +99,5 @@ void KOTodoViewItem::construct()
QDate d = mTodo->dtDue().date();
keyd.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
- setSortKey(3,keyd);
+ // setSortKey(3,keyd);
if (mTodo->doesFloat()) {
setText(4,"");
@@ -105,5 +107,5 @@ void KOTodoViewItem::construct()
QTime t = mTodo->dtDue().time();
keyt.sprintf("%02d%02d",t.hour(),t.minute());
- setSortKey(4,keyt);
+ //setSortKey(4,keyt);
}
} else {
@@ -117,6 +119,29 @@ void KOTodoViewItem::construct()
else setSortKey(1,QString::number(mTodo->priority())+keyd+keyt);
- setText(5,mTodo->cancelled() ? i18n("Yes") : i18n("No"));
- setText(6,mTodo->categoriesStr());
+
+
+ if (mTodo->hasStartDate()) {
+ setText(5, mTodo->dtStartDateStr());
+ QDate d = mTodo->dtStart().date();
+ skeyd.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
+
+ if (mTodo->doesFloat()) {
+ setText(6,"");
+ }
+ else {
+ setText(6,mTodo->dtStartTimeStr());
+ QTime t = mTodo->dtStart().time();
+ skeyt.sprintf("%02d%02d",t.hour(),t.minute());
+
+ }
+ } else {
+ setText(5,"");
+ setText(6,"");
+ }
+ setSortKey(5,skeyd);
+ setSortKey(6,skeyt);
+
+ setText(7,mTodo->cancelled() ? i18n("Yes") : i18n("No"));
+ setText(8,mTodo->categoriesStr());
#if 0
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 6e151f9..b2dd266 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -510,4 +510,5 @@ void KOViewManager::showTodoView()
KConfig *config = KOGlobals::config();
mTodoView->restoreLayout(config,"Todo View");
+ mTodoView->setNavigator( mMainView->dateNavigator() );
}
diff --git a/version b/version
index ef03779..65eb8d1 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "1.9.15";
+version = "1.9.16";