fastload fixes

4 files changed, 29 insertions, 16 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index af12f2b..4e2523e 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -614,3 +614,3 @@ void KABCore::saveSettings()
   KABPrefs::instance()->writeConfig();
-  qDebug("KA: KABCore::saveSettings() ");
+  //qDebug("KA: KABCore::saveSettings() ");
 }
@@ -846,3 +846,3 @@ void  KABCore::updateMainWindow()
     mMainWindow->showMaximized();
-    mMainWindow->update();
+    //mMainWindow->repaint();
 }
@@ -852,7 +852,10 @@ void KABCore::resizeEvent(QResizeEvent* e )
         return;
-    //qDebug("KABCore::resizeEvent(QResizeEvent* e ) ");
-    if ( e->oldSize().width() != e->size().width() )
+    static int desktop_width = 0;
+    //qDebug("KABCore::resizeEvent %d %d ",desktop_width,QApplication::desktop()->width()   );
+    if ( desktop_width != QApplication::desktop()->width() )
     if ( QApplication::desktop()->width() >= 480 ) {
         if (QApplication::desktop()->width() == 640 ) { // e.g. 640x480
+            //qDebug("640 ");
             if ( mMiniSplitter->orientation() == Qt::Vertical ) {
+                //qDebug("switch V->H ");
                 mMiniSplitter->setOrientation(  Qt::Horizontal);
@@ -861,2 +864,3 @@ void KABCore::resizeEvent(QResizeEvent* e )
             if ( QApplication::desktop()->width() <= 640 ) {
+                bool shot = mMainWindow->isVisible();
                 mMainWindow->showMinimized();
@@ -866,3 +870,4 @@ void KABCore::resizeEvent(QResizeEvent* e )
                     mIncSearchWidget->setSize();
-                QTimer::singleShot( 1, this , SLOT ( updateMainWindow()));
+                if ( shot )
+                    QTimer::singleShot( 1, this , SLOT ( updateMainWindow()));
             }
@@ -870,3 +875,5 @@ void KABCore::resizeEvent(QResizeEvent* e )
         } else if (QApplication::desktop()->width() == 480 ){// e.g. 480x640
+            //qDebug("480 ");
             if ( mMiniSplitter->orientation() == Qt::Horizontal ) {
+                //qDebug("switch H->V ");
                 mMiniSplitter->setOrientation( Qt::Vertical );
@@ -876,2 +883,3 @@ void KABCore::resizeEvent(QResizeEvent* e )
                 //mMainWindow->setMaximumSize( QApplication::desktop()->size()  );
+                bool shot = mMainWindow->isVisible();
                 mMainWindow->showMinimized();
@@ -884,3 +892,4 @@ void KABCore::resizeEvent(QResizeEvent* e )
                 }
-                QTimer::singleShot( 1, this , SLOT ( updateMainWindow()));
+                if ( shot )
+                    QTimer::singleShot( 1, this , SLOT ( updateMainWindow()));
             }
@@ -888,2 +897,3 @@ void KABCore::resizeEvent(QResizeEvent* e )
     }
+    desktop_width = QApplication::desktop()->width();
     QWidget::resizeEvent( e );
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 02fc40a..272f2eb 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -336,3 +336,4 @@ void KAddressBookTableView::refresh(QString uid)
     mListView->repaint();
-
+    if ( !currentItem ) 
+        currentItem =  (ContactListViewItem *)mListView->firstChild();
     if ( currentItem ) {
@@ -340,2 +341,3 @@ void KAddressBookTableView::refresh(QString uid)
       mListView->ensureItemVisible( currentItem );
+      mListView->setSelected( currentItem, true );
     }
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 8c72d89..70baf5c 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -291,7 +291,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
     mCalendarModifiedFlag = false;
-    QLabel* splash  = new QLabel(i18n("KO/Pi is starting ... "), this );
-    splash->setAlignment ( AlignCenter );
-    setCentralWidget( splash );
+    // QLabel* splash  = new QLabel(i18n("KO/Pi is starting ... "), this );
+    //splash->setAlignment ( AlignCenter );
+    //setCentralWidget( splash );
 #ifndef DESKTOP_VERSION
-    showMaximized();
+    //showMaximized();
 #endif
@@ -302,3 +302,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
     mView = new CalendarView( mCalendar, this,"mCalendar " );
-    mView->hide();
+    setCentralWidget( mView );
+    //mView->hide();
     //mView->resize(splash->size() );
@@ -363,4 +364,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
     globalFlagBlockStartup = 0;
-    mView->show();
-    delete splash;
+    //mView->show();
+    //delete splash;
     if ( newFile )
diff --git a/microkde/kdeui/ktoolbar.cpp b/microkde/kdeui/ktoolbar.cpp
index 36ede81..df2aad8 100644
--- a/microkde/kdeui/ktoolbar.cpp
+++ b/microkde/kdeui/ktoolbar.cpp
@@ -1417,3 +1417,3 @@ void KToolBar::repaintMe()
     QToolBar::repaint( true );
-    //qDebug(" KToolBar::repaintMe() ");
+    qDebug(" KToolBar::repaintMe() ");
 }
@@ -1422,4 +1422,4 @@ void KToolBar::showEvent( QShowEvent *e )
 {
-    QToolBar::showEvent( e );
     rebuildLayout();
+    QToolBar::showEvent( e );
 }