| -rw-r--r-- | korganizer/kodaymatrix.cpp | 2 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 4366265..30efbf6 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -205,2 +205,3 @@ QString KODayMatrix::getWhatsThisText( QPoint p ) } + mToolTip.sort(); if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) { @@ -220,3 +221,2 @@ QString KODayMatrix::getWhatsThisText( QPoint p ) } - mToolTip.sort(); if (KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) { diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index eed023c..3c0259f 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -189,3 +189,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : filterToolBar = new QPEToolBar ( this ); - filterMenubar = new QMenuBar( filterToolBar ); + filterMenubar = new QMenuBar( 0 ); QFontMetrics fm ( filterMenubar->font() ); @@ -1282,4 +1282,6 @@ void MainWindow::initActions() - if ( filterMenubar ) - connect( mView->filterView(), SIGNAL( filterChanged() ), SLOT( updateFilterToolbar() ) ); + 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 ) ) ); |