summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-02-06 15:21:01 (UTC)
committer zautrix <zautrix>2005-02-06 15:21:01 (UTC)
commit38898c49275bf27fb8c2df96d145f2a5abb62331 (patch) (side-by-side diff)
treeb96f0a336fccf4d6c67e6a4b5c1239b4d647b3b9
parent26b0c69fb3b11c29475ec02b2cfe52e33eb24e5f (diff)
downloadkdepimpi-38898c49275bf27fb8c2df96d145f2a5abb62331.zip
kdepimpi-38898c49275bf27fb8c2df96d145f2a5abb62331.tar.gz
kdepimpi-38898c49275bf27fb8c2df96d145f2a5abb62331.tar.bz2
fixxeess
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt5
-rw-r--r--korganizer/koeditorgeneraltodo.cpp2
-rw-r--r--korganizer/komonthview.cpp18
-rw-r--r--korganizer/komonthview.h3
-rw-r--r--korganizer/koviewmanager.cpp3
5 files changed, 25 insertions, 6 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
@@ -2,12 +2,17 @@ Info about the changes in new versions of KDE-Pim/Pi
********** VERSION 2.0.4 ************
KO/Pi:
Fixed problem loading translations for summary/location edit boxes in event/todo editor.
+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 ************
KO/Pi:
Added feature for changing alarm settings for many items at once:
Open list view (or search dialog), select the desired items and choose in
the popup menu: Set alarm for selected...
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index ce66863..da5ef07 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -161,13 +161,13 @@ void KOEditorGeneralTodo::initCompletion(QWidget *parent, QBoxLayout *topLayout)
mCompletedLabel->setSizePolicy( QSizePolicy( QSizePolicy::Expanding,QSizePolicy::Preferred) );
if ( QApplication::desktop()->width() <= 480 ) {
if ( QApplication::desktop()->width() < 320 )
mCompleteDateEdit->setMaximumWidth( 85 );
else
- mCompleteDateEdit->setMaximumWidth( 130 );
+ mCompleteDateEdit->setMaximumWidth( 140 );
topLayout->setSpacing( 0 );
}
}
void KOEditorGeneralTodo::initPriority(QWidget *parent, QBoxLayout *topLayout)
{
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 5926abe..ffb2e1e 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -550,19 +550,20 @@ void MonthViewCell::insertEvent(Event *event)
mItemList->insertItem( item );
mToolTip += "\n";
}
void MonthViewCell::insertTodo(Todo *todo)
{
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());
+ 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();
@@ -779,13 +780,12 @@ void MonthViewCell::contextMenu( QListBoxItem *item )
if ( incidence ) mMonthView->showContextMenu( incidence );
}
void MonthViewCell::selection( QListBoxItem *item )
{
if ( !item ) return;
-
mMonthView->setSelectedCell( this );
}
// *******************************************************************************
// *******************************************************************************
@@ -1262,16 +1262,22 @@ void KOMonthView::updateView()
}
void KOMonthView::resizeEvent(QResizeEvent * e)
{
qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height());
if ( ignoreResizeEvent ) {
+ 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;
+ }
if ( e->size().width()+ e->size().height() < 240 )
return;
computeLayout();
clPending = true;
if ( mShowWeekView )
mCellsW[0]->setFocus();
@@ -1508,13 +1514,13 @@ void KOMonthView::showContextMenu( Incidence *incidence )
MonthViewCell * KOMonthView::selectedCell( )
{
return mSelectedCell;
}
void KOMonthView::setSelectedCell( MonthViewCell *cell )
{
- // qDebug("KOMonthView::setSelectedCell ");
+ //qDebug("KOMonthView::setSelectedCell %x ", cell);
if ( mSelectedCell && mSelectedCell != cell ) {
MonthViewCell * mvc = mSelectedCell;
mSelectedCell = cell;
mvc->deselect();
} else
mSelectedCell = cell;
@@ -1547,19 +1553,25 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e )
{
//qDebug("KOMonthView::keyPressEvent ");
switch(e->key()) {
case Key_Up:
{
emit prevMonth();
+ if ( mShowWeekView )
+ mCellsW[0]->setFocus();
+ else
mCells[0]->setFocus();
}
e->accept();
break;
case Key_Down:
{
emit nextMonth();
+ if ( mShowWeekView )
+ mCellsW[0]->setFocus();
+ else
mCells[0]->setFocus();
}
e->accept();
break;
case Key_Return:
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 9dbe319..d70cda1 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -223,13 +223,13 @@ class KOMonthView: public KOEventView
virtual DateList selectedDates();
virtual void printPreview(CalPrinter *calPrinter,
const QDate &, const QDate &);
bool isMonthView() { return true; }
bool isUpdatePossible() { return updatePossible; }
- void setIgnoreResizeEvent( int c ) { ignoreResizeEvent = c ;}
+ void setIgnoreResizeEvent( int c, int h ) { ignoreResizeEvent = c ;ignoreResizeEventHeight = h;}
MonthViewCell * selectedCell();
public slots:
virtual void updateView();
virtual void updateConfig();
virtual void showDates(const QDate &start, const QDate &end);
@@ -257,12 +257,13 @@ class KOMonthView: public KOEventView
void resizeEvent(QResizeEvent *);
void viewChanged();
void updateDayLabels();
private:
int ignoreResizeEvent;
+ int ignoreResizeEventHeight;
int currentWeek();
bool clPending;
QWidgetStack * mWidStack;
QWidget* mMonthView;
QWidget* mWeekView;
bool mShowWeekView;
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index dcb51dc..c35de0a 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -220,13 +220,14 @@ void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView )
{
mCurrentAgendaView = 0;
int wid = mMainView->width() ;
int hei = mMainView->height();
if ( mCurrentView == mMonthView ) {
if ( true /* !KOPrefs::instance()->mMonthViewWeek*/ ) {
- mMonthView->setIgnoreResizeEvent( 2 );
+
+ mMonthView->setIgnoreResizeEvent( 2 ,mMainView->navigatorBar()->height());
mMainView->navigatorBar()->show();
hei -= mMainView->navigatorBar()->sizeHint().height();
}
//mMainView->navigatorBar()->hide();
} else {
mMainView->navigatorBar()->hide();