more fixes

1 files changed, 35 insertions, 3 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index ad1c0cd..2da592b 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1614,117 +1614,149 @@ void MainWindow::importOL()
 void MainWindow::importBday()
 {
     int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                        i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"),
                                        i18n("Import!"), i18n("Cancel"), 0,
                                        0, 1 );
     if ( result == 0 ) {
         mView->importBday();
 
     }
 
 
 }
 void MainWindow::importQtopia()
 {
     //#ifndef DESKTOP_VERSION
     QString mess = i18n("When importing a calendar twice\nduplicated events will be ignored!\nYou can create a backup file with\nFile - Save Calendar Backup\nto revert importing");
 #ifdef DESKTOP_VERSION
     mess += i18n("The content of the following files will be\nimported (located in your home directory (hd)):\n(hd)/Applications/datebook/datebook.xml\n(hd)/Applications/todolist/todolist.xml\nThe following category file will be used:\n(hd)/Settings/Categories.xml");
 #endif
     int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mess,
                                        i18n("Import!"), i18n("Cancel"), 0,
                                        0, 1 );
     if ( result == 0 ) {
 #ifndef DESKTOP_VERSION
         QString datebook = Global::applicationFileName( "datebook", "datebook.xml");
         QString todolist = Global::applicationFileName( "todolist", "todolist.xml");
         QString categories = QString( getenv( "HOME" ) ) + "/Settings/Categories.xml";
 #else
         QString datebook = QDir::homeDirPath()+ "/Applications/datebook/datebook.xml";
         QString todolist = QDir::homeDirPath()+ "/Applications/todolist/todolist.xml";
         QString categories = QDir::homeDirPath()+ "/Settings/Categories.xml";
 #endif
         mView->importQtopia( categories, datebook, todolist );
     }
 #if 0
     int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                        i18n("Not supported \non desktop!\n"),
                                        i18n("Ok"), i18n("Cancel"), 0,
                                        0, 1 );
 
 #endif
 }
 
 void MainWindow::saveOnClose()
 {
     KOPrefs *p = KOPrefs::instance();
     p->mToolBarHor = ( iconToolBar->orientation () == Qt:: Horizontal );
+    p->mToolBarHorV = ( viewToolBar->orientation () == Qt:: Horizontal );
+    p->mToolBarHorN = ( navigatorToolBar->orientation () == Qt:: Horizontal );
+    if ( filterToolBar ) {
+        p->mToolBarHorF = ( filterToolBar->orientation () == Qt:: Horizontal );
+    }
+#ifdef DESKTOP_VERSION
+    
+    QPoint myP;
+    myP = mapFromGlobal( iconToolBar->mapToGlobal( QPoint( 0,0) ) );
+    if (  p->mToolBarHor )
+        p->mToolBarUp = myP.y() > height()/2;
+    else
+        p->mToolBarUp = myP.x() > width()/2;
+    myP = mapFromGlobal( viewToolBar->mapToGlobal( QPoint( 0,0) ) );
+    if ( p->mToolBarHorV )
+        p->mToolBarUpV = myP.y()  > height()/2;
+    else
+        p->mToolBarUpV = myP.x() > width()/2 ;
+    myP = mapFromGlobal( navigatorToolBar->mapToGlobal( QPoint( 0,0) ) );
+    if ( p->mToolBarHorN )
+        p->mToolBarUpN = myP.y() > height()/2;
+    else
+        p->mToolBarUpN = myP.x() > width()/2 ;
+    if ( filterToolBar ) {
+        myP = mapFromGlobal( filterToolBar->mapToGlobal( QPoint( 0,0) ) );
+        if ( p->mToolBarHorF )
+            p->mToolBarUpF = myP.y() > height()/2;
+        else
+            p->mToolBarUpF = myP.x() > width()/2 ;
+    }
+#else
     if (  p->mToolBarHor )
         p->mToolBarUp = iconToolBar->y() > height()/2;
     else
         p->mToolBarUp = iconToolBar->x() > width()/2;
-    p->mToolBarHorV = ( viewToolBar->orientation () == Qt:: Horizontal );
     if ( p->mToolBarHorV )
         p->mToolBarUpV = viewToolBar->y() > height()/2;
     else
         p->mToolBarUpV = viewToolBar->x() > width()/2 ;
-    p->mToolBarHorN = ( navigatorToolBar->orientation () == Qt:: Horizontal );
+    
     if ( p->mToolBarHorN )
         p->mToolBarUpN = navigatorToolBar->y() > height()/2;
     else
         p->mToolBarUpN = navigatorToolBar->x() > width()/2 ;
     if ( filterToolBar ) {
-        p->mToolBarHorF = ( filterToolBar->orientation () == Qt:: Horizontal );
         if ( p->mToolBarHorF )
             p->mToolBarUpF = filterToolBar->y() > height()/2;
         else
             p->mToolBarUpF = filterToolBar->x() > width()/2 ;
     }
+#endif
+
+
     mView->writeSettings();
     if ( mCalendarModifiedFlag || mView->checkFileChanged( defaultFileName()))
         save();
 }
 void MainWindow::slotModifiedChanged( bool changed )
 {
     if ( mBlockAtStartup )
         return;
    
     int msec;
     // we store the changes after 1 minute,
     // and for safety reasons after 10 minutes again
     if ( !mSyncManager->blockSave() )
         msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000;
     else
         msec = 1000 * 600;
     mSaveTimer.start( msec, true ); // 1 minute
     qDebug("KO: Saving File in %d secs!", msec/1000);
     mCalendarModifiedFlag = true;
 }
 void MainWindow::saveStopTimer()
 {
     mSaveTimer.stop();
     if (mSaveTimer.isActive() )
         qDebug("ti active ");
     else
         qDebug("KO: Save timer stopped");
 }
 void MainWindow::save()
 {
     if ( !mCalendarModifiedFlag ) {
         qDebug("KO: Calendar not modified. Nothing saved.");
         return;
     }
     if ( mSyncManager->blockSave() )
         return;
     mSyncManager->setBlockSave(true);
     if ( mView->checkFileVersion( defaultFileName()) ) {
         QTime neededSaveTime = QDateTime::currentDateTime().time();
         setCaption(i18n("KO/Pi:Saving Data to File ..." ));
         qDebug("KO: Start saving data to file!");
         mView->saveCalendar( defaultFileName() );
         mCalendarModifiedFlag = false;
         int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
         qDebug("KO: Needed %d ms for saving.",msNeeded );
         QString savemes;
         savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000  );
         setCaption(savemes);