| author | zautrix <zautrix> | 2005-04-22 17:32:45 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-04-22 17:32:45 (UTC) |
| commit | e6feb1ca0c45397ba7b922198c87fe9b95b7d872 (patch) (side-by-side diff) | |
| tree | 61b56d5a17f3eba87fef958d264e2da679496bda /korganizer | |
| parent | 81158fa914f6d0f3aeb049d28d2ecfb5f5c0e261 (diff) | |
| download | kdepimpi-e6feb1ca0c45397ba7b922198c87fe9b95b7d872.zip kdepimpi-e6feb1ca0c45397ba7b922198c87fe9b95b7d872.tar.gz kdepimpi-e6feb1ca0c45397ba7b922198c87fe9b95b7d872.tar.bz2 | |
fixxxx
| -rw-r--r-- | korganizer/kodaymatrix.cpp | 2 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 4366265..30efbf6 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -203,6 +203,7 @@ QString KODayMatrix::getWhatsThisText( QPoint p ) //qDebug("TTT: %s ", mToolTipText.latin1()); mToolTip.append( deTag( mToolTipText ) ); } + mToolTip.sort(); if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) { QPtrList<Todo> todolist = mCalendar->todos(mDate); Todo *todo; @@ -218,7 +219,6 @@ QString KODayMatrix::getWhatsThisText( QPoint p ) mToolTip.append( mToolTipText ); } } - mToolTip.sort(); if (KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) { Journal *j = mCalendar->journal( mDate ); if ( j ) { diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index eed023c..3c0259f 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -187,7 +187,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : tbd = Left; } filterToolBar = new QPEToolBar ( this ); - filterMenubar = new QMenuBar( filterToolBar ); + filterMenubar = new QMenuBar( 0 ); QFontMetrics fm ( filterMenubar->font() ); filterPopupMenu = new QPopupMenu( this ); @@ -1280,8 +1280,10 @@ void MainWindow::initActions() configureToolBarMenu->setItemChecked( 6, true ); - if ( filterMenubar ) + if ( filterMenubar ) { + filterMenubar->reparent(filterToolBar,0,QPoint(0,0) ); connect( mView->filterView(), SIGNAL( filterChanged() ), SLOT( updateFilterToolbar() ) ); + } connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); configureAgenda( p->mHourSize ); connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); |