summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt5
-rw-r--r--korganizer/koeditorgeneraltodo.cpp2
-rw-r--r--korganizer/komonthview.cpp96
-rw-r--r--korganizer/komonthview.h3
-rw-r--r--korganizer/koviewmanager.cpp3
5 files changed, 64 insertions, 45 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 4251283..e21bb44 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -7,2 +7,7 @@ Fixed problem loading translations for summary/location edit boxes in event/todo
+Added a general "select week number" to the toolbar.
+
+Fixed some small problem of the new features introduced in version 2.0.3.
+
+
********** VERSION 2.0.3 ************
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index ce66863..da5ef07 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -166,3 +166,3 @@ void KOEditorGeneralTodo::initCompletion(QWidget *parent, QBoxLayout *topLayout)
else
- mCompleteDateEdit->setMaximumWidth( 130 );
+ mCompleteDateEdit->setMaximumWidth( 140 );
topLayout->setSpacing( 0 );
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 5926abe..ffb2e1e 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -94,3 +94,3 @@ QString KNoScrollListBox::getWhatsThisText(QPoint p)
if ( ! item ) {
- return i18n("Click in the cell\nto add an event!");
+ return i18n("Click in the cell\nto add an event!");
}
@@ -321,3 +321,3 @@ MonthViewCell::MonthViewCell( KOMonthView *parent,QWidget* par )
connect( mItemList, SIGNAL( highlighted( QListBoxItem *) ),
- SLOT( selection( QListBoxItem * ) ) );
+ SLOT( selection( QListBoxItem * ) ) );
connect( mItemList, SIGNAL( clicked( QListBoxItem * ) ),
@@ -554,39 +554,40 @@ void MonthViewCell::insertTodo(Todo *todo)
{
- QString text;
- if (todo->hasDueDate()) {
- if (!todo->doesFloat()) {
- text += KGlobal::locale()->formatTime(todo->dtDue().time());
- text += " ";
- }
+ QString text;
+ mItemList->setFocusPolicy(WheelFocus);
+ if (todo->hasDueDate()) {
+ if (!todo->doesFloat()) {
+ text += KGlobal::locale()->formatTime(todo->dtDue().time());
+ text += " ";
}
- text += i18n("Td: %1").arg(todo->summary());
-
- MonthViewItem *item = new MonthViewItem( todo, mDate, text );
- //item->setPalette( mStandardPalette );
- QPalette pal;
- if (KOPrefs::instance()->mMonthViewUsesCategoryColor) {
- QStringList categories = todo->categories();
- QString cat = categories.first();
- if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) {
- pal = getPalette();
- if (cat.isEmpty()) {
- pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor);
- } else {
- pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat)));
- }
-
+ }
+ text += i18n("T: %1").arg(todo->summary());
+
+ MonthViewItem *item = new MonthViewItem( todo, mDate, text );
+ //item->setPalette( mStandardPalette );
+ QPalette pal;
+ if (KOPrefs::instance()->mMonthViewUsesCategoryColor) {
+ QStringList categories = todo->categories();
+ QString cat = categories.first();
+ if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) {
+ pal = getPalette();
+ if (cat.isEmpty()) {
+ pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor);
} else {
- if (cat.isEmpty()) {
- pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor);
- } else {
- pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat)));
- }
+ pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat)));
}
-
+
} else {
- pal = mStandardPalette ;
+ if (cat.isEmpty()) {
+ pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor);
+ } else {
+ pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat)));
+ }
}
- item->setPalette( pal );
- mItemList->insertItem( item );
- mToolTip += text+"\n";
+
+ } else {
+ pal = mStandardPalette ;
+ }
+ item->setPalette( pal );
+ mItemList->insertItem( item );
+ mToolTip += text+"\n";
}
@@ -784,3 +785,2 @@ void MonthViewCell::selection( QListBoxItem *item )
if ( !item ) return;
-
mMonthView->setSelectedCell( this );
@@ -1267,5 +1267,11 @@ void KOMonthView::resizeEvent(QResizeEvent * e)
if ( ignoreResizeEvent ) {
- qDebug("KOMonthView::resizeEvent ignored ");
- --ignoreResizeEvent;
- return;
+ int diff = e->size().height() - e->oldSize().height();
+ if ( diff < 0 )
+ diff = diff * (-1);
+ if ( diff == ignoreResizeEventHeight ) {
+ qDebug("KOMonthView::resizeEvent ignored ");
+ --ignoreResizeEvent;
+ return;
+ }
+ ignoreResizeEvent = 0;
}
@@ -1513,3 +1519,3 @@ void KOMonthView::setSelectedCell( MonthViewCell *cell )
{
- // qDebug("KOMonthView::setSelectedCell ");
+ //qDebug("KOMonthView::setSelectedCell %x ", cell);
if ( mSelectedCell && mSelectedCell != cell ) {
@@ -1552,3 +1558,6 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e )
emit prevMonth();
- mCells[0]->setFocus();
+ if ( mShowWeekView )
+ mCellsW[0]->setFocus();
+ else
+ mCells[0]->setFocus();
}
@@ -1559,4 +1568,7 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e )
emit nextMonth();
- mCells[0]->setFocus();
-
+ if ( mShowWeekView )
+ mCellsW[0]->setFocus();
+ else
+ mCells[0]->setFocus();
+
}
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 9dbe319..d70cda1 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -228,3 +228,3 @@ class KOMonthView: public KOEventView
bool isUpdatePossible() { return updatePossible; }
- void setIgnoreResizeEvent( int c ) { ignoreResizeEvent = c ;}
+ void setIgnoreResizeEvent( int c, int h ) { ignoreResizeEvent = c ;ignoreResizeEventHeight = h;}
@@ -262,2 +262,3 @@ class KOMonthView: public KOEventView
int ignoreResizeEvent;
+ int ignoreResizeEventHeight;
int currentWeek();
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index dcb51dc..c35de0a 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -225,3 +225,4 @@ void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView )
if ( true /* !KOPrefs::instance()->mMonthViewWeek*/ ) {
- mMonthView->setIgnoreResizeEvent( 2 );
+
+ mMonthView->setIgnoreResizeEvent( 2 ,mMainView->navigatorBar()->height());
mMainView->navigatorBar()->show();