3 files changed, 40 insertions, 4 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 9c40142..a4f3579 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -549,8 +549,24 @@ void KABCore::restoreSettings()
       mExtensionBarSplitter->setSizes( splitterSize );
 
   }
+#ifdef DESKTOP_VERSION
+  KConfig *config = KABPrefs::instance()->getConfig();
+  config->setGroup("WidgetLayout");
+  QStringList list;
+  list = config->readListEntry("MainLayout");
+  int x,y,w,h;
+  if ( ! list.isEmpty() ) {
+      x = list[0].toInt();
+      y = list[1].toInt();
+      w = list[2].toInt();
+      h = list[3].toInt(); 
+      KApplication::testCoords( &x,&y,&w,&h );
+      topLevelWidget()->setGeometry(x,y,w,h);
 
-
+  } else {
+      topLevelWidget()->setGeometry( 40 ,40 , 640, 440);
+  }
+#endif
 }
 
 void KABCore::saveSettings()
@@ -569,6 +585,24 @@ void KABCore::saveSettings()
   mViewManager->saveSettings();
 
   KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem();
+#ifdef DESKTOP_VERSION
+  KConfig *config = KABPrefs::instance()->getConfig();
+  config->setGroup("WidgetLayout");
+  QStringList list ;//= config->readListEntry("MainLayout");
+  int x,y,w,h;
+  QWidget* wid;
+  wid = topLevelWidget();
+  x = wid->geometry().x();
+  y = wid->geometry().y();
+  w = wid->width();
+  h = wid->height();
+  list.clear();
+  list << QString::number( x );
+  list << QString::number( y );
+  list << QString::number( w );
+  list << QString::number( h );
+  config->writeEntry("MainLayout",list );
+#endif
   KABPrefs::instance()->writeConfig();
   qDebug("KA: KABCore::saveSettings() ");
 }
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 ) ) );