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
@@ -487,530 +487,540 @@ void KABCore::toggleBeamReceive( )
 void KABCore::disableBR(bool b)
 {
 #ifndef DESKTOP_VERSION
     if ( b ) {
         if ( infrared ) {
             toggleBeamReceive( );
         }
         mBRdisabled = true;
     } else {
         if ( mBRdisabled ) {
             mBRdisabled = false;
             //toggleBeamReceive( );
         }
     }
 #endif
 
 }
 void KABCore::recieve( QString fn  )
 {
     //qDebug("KABCore::recieve ");
     int count = mAddressBook->importFromFile( fn, true );
     if ( count )
         setModified( true );
     mViewManager->refreshView();
     message(i18n("%1 contact(s) received!").arg( count ));
     topLevelWidget()->showMaximized();
     topLevelWidget()->raise();
 }
 void KABCore::restoreSettings()
 {
   mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce;
 
   bool state;
 
   if (mMultipleViewsAtOnce)
     state = KABPrefs::instance()->mDetailsPageVisible;
   else
     state = false;
 
   mActionDetails->setChecked( state );
   setDetailsVisible( state );
 
   state = KABPrefs::instance()->mJumpButtonBarVisible;
 
   mActionJumpBar->setChecked( state );
   setJumpButtonBarVisible( state );
 /*US
  QValueList<int> splitterSize = KABPrefs::instance()->mDetailsSplitter;
   if ( splitterSize.count() == 0 ) {
     splitterSize.append( width() / 2 );
     splitterSize.append( width() / 2 );
   }
   mMiniSplitter->setSizes( splitterSize );
   if (  mExtensionBarSplitter ) {
   splitterSize = KABPrefs::instance()->mExtensionsSplitter;
   if ( splitterSize.count() == 0 ) {
     splitterSize.append( width() / 2 );
     splitterSize.append( width() / 2 );
   }
   mExtensionBarSplitter->setSizes( splitterSize );
 
   }
 */
   mViewManager->restoreSettings();
   mIncSearchWidget->setCurrentItem( KABPrefs::instance()->mCurrentIncSearchField );
   mExtensionManager->restoreSettings();
 #ifdef DESKTOP_VERSION
   int wid = width();
   if ( wid < 10 )
       wid = 400;
 #else
   int wid = QApplication::desktop()->width();
   if ( wid < 640 )
       wid = QApplication::desktop()->height();
 #endif
   QValueList<int> splitterSize;// = KABPrefs::instance()->mDetailsSplitter;
   if ( true /*splitterSize.count() == 0*/ ) {
       splitterSize.append( wid / 2 );
       splitterSize.append( wid / 2 );
   }
   mMiniSplitter->setSizes( splitterSize );
   if (  mExtensionBarSplitter ) {
       //splitterSize = KABPrefs::instance()->mExtensionsSplitter;
       if ( true /*splitterSize.count() == 0*/ ) {
           splitterSize.append( wid / 2 );
           splitterSize.append( wid / 2 );
       }
       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()
 {
   KABPrefs::instance()->mJumpButtonBarVisible = mActionJumpBar->isChecked();
   if ( mExtensionBarSplitter )
     KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes();
   KABPrefs::instance()->mDetailsPageVisible = mActionDetails->isChecked();
   KABPrefs::instance()->mDetailsSplitter = mMiniSplitter->sizes();
 #ifndef KAB_EMBEDDED
 
   KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes();
   KABPrefs::instance()->mDetailsSplitter = mDetailsSplitter->sizes();
 #endif //KAB_EMBEDDED
   mExtensionManager->saveSettings();
   mViewManager->saveSettings();
 
   KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem();
 
   KABPrefs::instance()->writeConfig();
-  qDebug("KA: KABCore::saveSettings() ");
+  //qDebug("KA: KABCore::saveSettings() ");
 }
 
 KABC::AddressBook *KABCore::addressBook() const
 {
   return mAddressBook;
 }
 
 KConfig *KABCore::config()
 {
 #ifndef KAB_EMBEDDED
   return KABPrefs::instance()->config();
 #else //KAB_EMBEDDED
   return KABPrefs::instance()->getConfig();
 #endif //KAB_EMBEDDED
 }
 
 KActionCollection *KABCore::actionCollection() const
 {
   return mGUIClient->actionCollection();
 }
 
 KABC::Field *KABCore::currentSearchField() const
 {
    if (mIncSearchWidget)
     return mIncSearchWidget->currentField();
   else
     return 0;
 }
 
 QStringList KABCore::selectedUIDs() const
 {
   return mViewManager->selectedUids();
 }
 
 KABC::Resource *KABCore::requestResource( QWidget *parent )
 {
   QPtrList<KABC::Resource> kabcResources = addressBook()->resources();
 
   QPtrList<KRES::Resource> kresResources;
   QPtrListIterator<KABC::Resource> resIt( kabcResources );
   KABC::Resource *resource;
   while ( ( resource = resIt.current() ) != 0 ) {
     ++resIt;
     if ( !resource->readOnly() ) {
       KRES::Resource *res = static_cast<KRES::Resource*>( resource );
       if ( res )
         kresResources.append( res );
     }
   }
 
   KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, parent );
   return static_cast<KABC::Resource*>( res );
 }
 
 #ifndef KAB_EMBEDDED
 KAboutData *KABCore::createAboutData()
 #else //KAB_EMBEDDED
 void KABCore::createAboutData()
 #endif //KAB_EMBEDDED
 {
 
 
   QString version;
 #include <../version>
     QMessageBox::about( this, "About KAddressbook/Pi",
                         "KAddressbook/Platform-independent\n"
                         "(KA/Pi) " +version + " - " +
 #ifdef DESKTOP_VERSION
                         "Desktop Edition\n"
 #else
                         "PDA-Edition\n"
                         "for: Zaurus 5500 / 7x0 / 8x0\n"
 #endif
 
                         "(c) 2004 Ulf Schenk\n"
                         "(c) 2004-2005 Lutz Rogowski\nrogowski@kde.org\n"
                         "(c) 1997-2003, The KDE PIM Team\n"
   "Tobias Koenig Maintainer\n"
   "Don Sanders Original author\n"
   "Cornelius Schumacher Co-maintainer\n"
   "Mike Pilone GUI and framework redesign\n"
   "Greg Stern DCOP interface\n"
   "Mark Westcot Contact pinning\n"
   "Michel Boyer de la Giroday LDAP Lookup\n"
   "Steffen Hansen LDAP Lookup"
 #ifdef _WIN32_
  "(c) 2004 Lutz Rogowski Import from OL\nrogowski@kde.org\n"
 #endif
  );
 }
 
 void KABCore::setContactSelected( const QString &uid )
 {
   KABC::Addressee addr = mAddressBook->findByUid( uid );
   if ( !mDetails->isHidden() )
     mDetails->setAddressee( addr );
 
   if ( !addr.isEmpty() ) {
     emit contactSelected( addr.formattedName() );
     KABC::Picture pic = addr.photo();
     if ( pic.isIntern() ) {
 //US      emit contactSelected( pic.data() );
 //US instead use:
       QPixmap px;
       if (pic.data().isNull() != true)
       {
         px.convertFromImage(pic.data());
       }
 
       emit contactSelected( px );
     }
   }
 
 
   mExtensionManager->setSelectionChanged();
 
   // update the actions
   bool selected = !uid.isEmpty();
 
   if ( mReadWrite ) {
     mActionCut->setEnabled( selected );
     mActionPaste->setEnabled( selected );
   }
 
   mActionCopy->setEnabled( selected );
   mActionDelete->setEnabled( selected );
   mActionEditAddressee->setEnabled( selected );
   mActionMail->setEnabled( selected );
   mActionMailVCard->setEnabled( selected );
   //if (mActionBeam)
   //mActionBeam->setEnabled( selected );
   mActionWhoAmI->setEnabled( selected );
 }
 
 void KABCore::sendMail()
 {
   sendMail( mViewManager->selectedEmails().join( ", " ) );
 }
 
 void KABCore::sendMail( const QString& emaillist )
 {
   // the parameter has the form "name1 <abc@aol.com>,name2 <abc@aol.com>;... "
   if (emaillist.contains(",") > 0)
     ExternalAppHandler::instance()->mailToMultipleContacts( emaillist, QString::null );
   else
     ExternalAppHandler::instance()->mailToOneContact( emaillist );
 }
 
 
 
 void KABCore::mailVCard()
 {
   QStringList uids = mViewManager->selectedUids();
   if ( !uids.isEmpty() )
     mailVCard( uids );
 }
 
 void KABCore::mailVCard( const QStringList& uids )
 {
   QStringList urls;
 
 //  QString tmpdir = locateLocal("tmp", KGlobal::getAppName());
 
   QString dirName = "/tmp/" + KApplication::randomString( 8 );
 
 
 
   QDir().mkdir( dirName, true );
 
   for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
     KABC::Addressee a = mAddressBook->findByUid( *it );
 
     if ( a.isEmpty() )
       continue;
 
     QString name = a.givenName() + "_" + a.familyName() + ".vcf";
 
     QString fileName = dirName + "/" + name;
 
     QFile outFile(fileName);
 
     if ( outFile.open(IO_WriteOnly) ) {  // file opened successfully
       KABC::VCardConverter converter;
       QString vcard;
 
       converter.addresseeToVCard( a, vcard );
 
       QTextStream t( &outFile );  // use a text stream
       t.setEncoding( QTextStream::UnicodeUTF8 );
       t << vcard;
 
       outFile.close();
 
       urls.append( fileName );
     }
   }
 
   bool result = ExternalAppHandler::instance()->mailToMultipleContacts( QString::null, urls.join(", ") );
 
 
 /*US
   kapp->invokeMailer( QString::null, QString::null, QString::null,
                       QString::null,  // subject
                       QString::null,  // body
                       QString::null,
                       urls );  // attachments
 */
 
 }
 
 /**
   Beams the "WhoAmI contact.
 */
 void KABCore::beamMySelf()
 {
   KABC::Addressee a = KABC::StdAddressBook::self()->whoAmI();
   if (!a.isEmpty())
   {
     QStringList uids;
     uids << a.uid();
 
 	beamVCard(uids);
   } else {
       KMessageBox::information( this, i18n( "Your personal contact is\nnot set! Please select it\nand set it with menu:\nSettings - Set Who Am I\n" ) );
 
 
   }
 }
 void  KABCore::updateMainWindow()
 {
     mMainWindow->showMaximized();
-    mMainWindow->update();
+    //mMainWindow->repaint();
 }
 void KABCore::resizeEvent(QResizeEvent* e )
 {
     if ( !mMiniSplitter )
         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);
                 mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
             }
             if ( QApplication::desktop()->width() <= 640 ) {
+                bool shot = mMainWindow->isVisible();
                 mMainWindow->showMinimized();
                 //mMainWindow->setMaximumSize( QApplication::desktop()->size()  );
                 mViewManager->getFilterAction()->setComboWidth( 150 );
                 if ( mIncSearchWidget )
                     mIncSearchWidget->setSize();
-                QTimer::singleShot( 1, this , SLOT ( updateMainWindow()));
+                if ( shot )
+                    QTimer::singleShot( 1, this , SLOT ( updateMainWindow()));
             }
             
         } else if (QApplication::desktop()->width() == 480 ){// e.g. 480x640
+            //qDebug("480 ");
             if ( mMiniSplitter->orientation() == Qt::Horizontal ) {
+                //qDebug("switch H->V ");
                 mMiniSplitter->setOrientation( Qt::Vertical );
                 mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
             }
             if ( QApplication::desktop()->width() <= 640 ) {
                 //mMainWindow->setMaximumSize( QApplication::desktop()->size()  );
+                bool shot = mMainWindow->isVisible();
                 mMainWindow->showMinimized();
                 if ( KABPrefs::instance()->mHideSearchOnSwitch ) { 
                     if ( mIncSearchWidget ) {
                         mIncSearchWidget->setSize();
                     }
                 } else {
                     mViewManager->getFilterAction()->setComboWidth( 0 );
                 }
-                QTimer::singleShot( 1, this , SLOT ( updateMainWindow()));
+                if ( shot )
+                    QTimer::singleShot( 1, this , SLOT ( updateMainWindow()));
             }
         }
     }
+    desktop_width = QApplication::desktop()->width();
     QWidget::resizeEvent( e );
 
 }
 void KABCore::export2phone()
 {
 
     QStringList uids;
     XXPortSelectDialog dlg( this, false, this );
     if ( dlg.exec() )
         uids = dlg.uids();
     else
         return;
     if ( uids.isEmpty() )
         return;
     // qDebug("count %d ", uids.count());
    
     KAex2phonePrefs ex2phone;
     ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection );
     ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice );
     ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel );
 
     if ( !ex2phone.exec() ) {
         return;
     }
     KPimGlobalPrefs::instance()->mEx2PhoneConnection  = ex2phone.mPhoneConnection->text();
     KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text();
     KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text();
 
 
     PhoneAccess::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice,
                               KPimGlobalPrefs::instance()->mEx2PhoneConnection,
                               KPimGlobalPrefs::instance()->mEx2PhoneModel );
 
     QString  fileName = getPhoneFile();
     if ( ! mAddressBook->export2PhoneFormat( uids ,fileName ) )
         return;
     
     message(i18n("Exporting to phone..."));
     QTimer::singleShot( 1, this , SLOT ( writeToPhone()));
 
 }
 QString KABCore::getPhoneFile()
 {
 #ifdef DESKTOP_VERSION
     return  locateLocal("tmp", "phonefile.vcf");
 #else
     return "/tmp/phonefile.vcf";
 #endif
 
 }
 void KABCore::writeToPhone( )
 {
     if ( PhoneAccess::writeToPhone( getPhoneFile() ) )
         message(i18n("Export to phone finished!"));
     else
         qDebug(i18n("KA: Error exporting to phone"));
 }
 void KABCore::beamVCard()
 { 
     QStringList uids;
     XXPortSelectDialog dlg( this, false, this );
     if ( dlg.exec() )
         uids = dlg.uids();
     else
         return;
     if ( uids.isEmpty() )
         return;
     beamVCard( uids );
 }
 
 
 void KABCore::beamVCard(const QStringList& uids)
 {
 
     // LR: we should use the /tmp dir on the Zaurus,
     //  because: /tmp = RAM, (HOME)/kdepim = flash memory
    
 #ifdef DESKTOP_VERSION
   QString fileName = locateLocal("tmp", "kapibeamfile.vcf");
 #else
   QString fileName = "/tmp/kapibeamfile.vcf";
 #endif
 
   KABC::VCardConverter converter;
   QString description;
   QString datastream;
   for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
       KABC::Addressee a = mAddressBook->findByUid( *it );
 
       if ( a.isEmpty() )
           continue;
 
       if (description.isEmpty())
           description = a.formattedName();
 
       QString vcard;
       converter.addresseeToVCard( a, vcard );
       int start = 0;
       int next;
       while ( (next = vcard.find("TYPE=", start) )>= 0 ) {
           int semi = vcard.find(";", next);
           int dopp = vcard.find(":", next);
           int sep;
           if ( semi < dopp && semi >= 0 )
               sep = semi ;
           else
               sep = dopp;
           datastream +=vcard.mid( start, next - start);
           datastream +=vcard.mid( next+5,sep -next -5 ).upper();
           start = sep;
       }
       datastream += vcard.mid( start,vcard.length() );
   }
 #ifndef DESKTOP_VERSION
   QFile outFile(fileName);
   if ( outFile.open(IO_WriteOnly) ) { 
       datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" );
       QTextStream t( &outFile );  // use a text stream
       //t.setEncoding( QTextStream::UnicodeUTF8 );
       t.setEncoding( QTextStream::Latin1 );
       t <<datastream.latin1();
       outFile.close();
       Ir *ir = new Ir( this );
       connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
       ir->send( fileName, description, "text/x-vCard" );
   } else {
       qDebug("KA: Error open temp  beam file ");
       return;
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
@@ -209,260 +209,262 @@ void KAddressBookTableView::doSearch( const QString&  s, KABC::Field *field  )
     }
     else
         emit selected(QString::null);
    
 }
 void KAddressBookTableView::writeConfig(KConfig *config)
 {
   KAddressBookView::writeConfig(config);
 
   mListView->saveLayout(config, config->group());
 }
 
 void KAddressBookTableView::readConfig(KConfig *config)
 {
   KAddressBookView::readConfig( config );
   // The config could have changed the fields, so we need to reconstruct
   // the listview.
   reconstructListView();
 
   // costum colors?
   if ( config->readBoolEntry( "EnableCustomColors", false ) )
   {
     QPalette p( mListView->palette() );
     QColor c = p.color(QPalette::Normal, QColorGroup::Base );
     p.setColor( QPalette::Normal, QColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) );
     c = p.color(QPalette::Normal, QColorGroup::Text );
     p.setColor( QPalette::Normal, QColorGroup::Text, config->readColorEntry( "TextColor", &c ) );
     c = p.color(QPalette::Normal, QColorGroup::Button );
     p.setColor( QPalette::Normal, QColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) );
     c = p.color(QPalette::Normal, QColorGroup::ButtonText );
     p.setColor( QPalette::Normal, QColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) );
     c = p.color(QPalette::Normal, QColorGroup::Highlight );
     p.setColor( QPalette::Normal, QColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) );
     c = p.color(QPalette::Normal, QColorGroup::HighlightedText );
     p.setColor( QPalette::Normal, QColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) );
 #ifndef KAB_EMBEDDED  
   c = KGlobalSettings::alternateBackgroundColor();
 #else //KAB_EMBEDDED  
   c = QColor(240, 240, 240);
 #endif //KAB_EMBEDDED  
     c = config->readColorEntry ("AlternatingBackgroundColor", &c);
     mListView->setAlternateColor(c);
 
 
     //US    mListView->viewport()->setPalette( p );
     mListView->setPalette( p );
   }
   else
   {
     // needed if turned off during a session.
     //US    mListView->viewport()->setPalette( mListView->palette() );
     mListView->setPalette( mListView->palette() );
   }
   
   //custom fonts?
   QFont f( font() );
   if ( config->readBoolEntry( "EnableCustomFonts", false ) )
   {
     mListView->setFont( config->readFontEntry( "TextFont", &f) );
     f.setBold( true );
     //US    mListView->setHeaderFont( config->readFontEntry( "HeaderFont", &f ) );
     mListView->header()->setFont( config->readFontEntry( "HeaderFont", &f ) );
   }
   else
   {
     mListView->setFont( f );
     f.setBold( true );
     //US    mListView->setHeaderFont( f );
     mListView->header()->setFont( f );
   }  
 
   // Set the list view options
   mListView->setAlternateBackgroundEnabled(config->readBoolEntry("ABackground",
                                                                  true));
   mListView->setSingleLineEnabled(config->readBoolEntry("SingleLine", false));
   mListView->setToolTipsEnabled(config->readBoolEntry("ToolTips", true));
 
   if (config->readBoolEntry("Background", false))
     mListView->setBackgroundPixmap(config->readEntry("BackgroundName"));
 
   // Restore the layout of the listview
   mListView->restoreLayout(config, config->group());
 }
 
 void KAddressBookTableView::refresh(QString uid)
 {
   // For now just repopulate. In reality this method should
   // check the value of uid, and if valid iterate through
   // the listview to find the entry, then tell it to refresh.
 
   if (uid.isNull()) {
     // Clear the list view
     QString currentUID, nextUID;
 #ifndef KAB_EMBEDDED
     ContactListViewItem *currentItem = dynamic_cast<ContactListViewItem*>( mListView->currentItem() );
 #else //KAB_EMBEDDED
     ContactListViewItem *currentItem = (ContactListViewItem*)( mListView->currentItem() );
 #endif //KAB_EMBEDDED
 
     if ( currentItem ) {
 #ifndef KAB_EMBEDDED
       ContactListViewItem *nextItem = dynamic_cast<ContactListViewItem*>( currentItem->itemBelow() );
 #else //KAB_EMBEDDED
       ContactListViewItem *nextItem = (ContactListViewItem*)( currentItem->itemBelow() );
 #endif //KAB_EMBEDDED
       if ( nextItem )
         nextUID = nextItem->addressee().uid();
       currentUID = currentItem->addressee().uid();
     }
 
     mListView->clear();
 
     currentItem = 0;
     KABC::Addressee::List addresseeList = addressees();
     KABC::Addressee::List::Iterator it;
     for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
         if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
             continue;
       ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
       if ( (*it).uid() == currentUID )
         currentItem = item;
       else if ( (*it).uid() == nextUID && !currentItem )
         currentItem = item;
     }
 
     // Sometimes the background pixmap gets messed up when we add lots
     // of items.
     mListView->repaint();
-
+    if ( !currentItem ) 
+        currentItem =  (ContactListViewItem *)mListView->firstChild();
     if ( currentItem ) {
       mListView->setCurrentItem( currentItem );
       mListView->ensureItemVisible( currentItem );
+      mListView->setSelected( currentItem, true );
     }
   } else {
     // Only need to update on entry. Iterate through and try to find it
     ContactListViewItem *ceItem;
     QListViewItemIterator it( mListView );
     while ( it.current() ) {
 #ifndef KAB_EMBEDDED
       ceItem = dynamic_cast<ContactListViewItem*>( it.current() );
 #else //KAB_EMBEDDED
       ceItem = (ContactListViewItem*)( it.current() );
 #endif //KAB_EMBEDDED
 
       if ( ceItem && ceItem->addressee().uid() == uid ) {
         ceItem->refresh();
         return;
       }
       ++it;
     }
 
     refresh( QString::null );
   }
 }
 
 QStringList KAddressBookTableView::selectedUids()
 {
     QStringList uidList;
     QListViewItem *item;
     ContactListViewItem *ceItem;
 
     for(item = mListView->firstChild(); item; item = item->itemBelow())
     {
         if (mListView->isSelected( item ))
         {
 #ifndef KAB_EMBEDDED
             ceItem = dynamic_cast<ContactListViewItem*>(item);
 #else //KAB_EMBEDDED
             ceItem = (ContactListViewItem*)(item);
 #endif //KAB_EMBEDDED
 
             if (ceItem != 0L)
                 uidList << ceItem->addressee().uid();
         }
     }
     if ( uidList.count() == 0 )
         if ( mListView->currentItem() ) {
             ceItem = (ContactListViewItem*)(mListView->currentItem()) ;
             uidList << ceItem->addressee().uid();
         }
 
     return uidList;
 }
 
 void KAddressBookTableView::setSelected(QString uid, bool selected)
 {
     QListViewItem *item;
     ContactListViewItem *ceItem;
 
     if (uid.isNull())
     {
         mListView->selectAll(selected);
     }
     else
     {
         for(item = mListView->firstChild(); item; item = item->itemBelow())
         {
 #ifndef KAB_EMBEDDED
             ceItem = dynamic_cast<ContactListViewItem*>(item);
 #else //KAB_EMBEDDED
             ceItem = (ContactListViewItem*)(item);
 #endif //KAB_EMBEDDED
 
 
             if ((ceItem != 0L) && (ceItem->addressee().uid() == uid))
             {
                 mListView->setSelected(item, selected);
 
                 if (selected)
                     mListView->ensureItemVisible(item);
             }
         }
     }
 }
 
 void KAddressBookTableView::addresseeSelected()
 {
     // We need to try to find the first selected item. This might not be the
     // last selected item, but when QListView is in multiselection mode,
     // there is no way to figure out which one was
     // selected last.
     QListViewItem *item;
     bool found =false;
     for (item = mListView->firstChild(); item && !found;
          item = item->nextSibling())
     {
         if (item->isSelected())
         {
             found = true;
 #ifndef KAB_EMBEDDED
             ContactListViewItem *ceItem
                  = dynamic_cast<ContactListViewItem*>(item);
 #else //KAB_EMBEDDED
             ContactListViewItem *ceItem
                  = (ContactListViewItem*)(item);
 #endif //KAB_EMBEDDED
 
             if ( ceItem ) emit selected(ceItem->addressee().uid());
         }
     }
 
     if (!found)
         emit selected(QString::null);
 }
 
 void KAddressBookTableView::addresseeExecuted(QListViewItem *item)
 {
     if (item)
     {
 #ifndef KAB_EMBEDDED
         ContactListViewItem *ceItem
                = dynamic_cast<ContactListViewItem*>(item);
 #else //KAB_EMBEDDED
             ContactListViewItem *ceItem
                  = (ContactListViewItem*)(item);
 #endif //KAB_EMBEDDED
 
        if (ceItem)
        {
            emit executed(ceItem->addressee().uid());
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 8c72d89..70baf5c 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -164,330 +164,331 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
         sgListViewJournalPix->fill( Qt::white ); 
         {
             QPainter p ( sgListViewJournalPix );
             p.drawRect( 0,0,11,11);
             p.drawLine( 2,3,5,3);
             p.drawLine( 2,5,8,5);
             p.drawLine( 2,7,6,7);
         }
     }
     mClosed = false;
     //QString confFile = KStandardDirs::appDir() + "config/korganizerrc";
     QString confFile = locateLocal("config","korganizerrc");
     QFileInfo finf ( confFile );
     bool showWarning =  !finf.exists();
     setIcon(SmallIcon( "ko24" )  );
     mBlockAtStartup = true;
     mFlagKeyPressed = false;
     setCaption("KO/Pi");
     KOPrefs *p = KOPrefs::instance();
     //KPimGlobalPrefs::instance()->setGlobalConfig();
     p->mCurrentDisplayedView = 0;
     if ( p->mHourSize >  22 )
         p->mHourSize = 22;
     QMainWindow::ToolBarDock tbd;
     if ( p->mToolBarHor ) {
         if ( p->mToolBarUp )
             tbd = Bottom;
         else
             tbd = Top;
     }
     else {
         if ( p->mToolBarUp )
             tbd = Right;
         else
             tbd = Left;
     }
     if ( KOPrefs::instance()->mUseAppColors )
         QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true );
     globalFlagBlockStartup = 1;
     iconToolBar = new QPEToolBar( this );
     addToolBar (iconToolBar , tbd );
 
 #ifdef DESKTOP_VERSION
     if ( KOPrefs::instance()->mShowIconFilter ) 
 #else
         if ( KOPrefs::instance()->mShowIconFilter || ( !p->mShowIconOnetoolbar &&!p->mShowIconFilterview ) )
 #endif
 
 {
         if ( p->mToolBarHorF ) {
             if ( p->mToolBarUpF )
                 tbd = Bottom;
             else
                 tbd = Top;
         }
         else {
             if ( p->mToolBarUpF )
             tbd = Right;
             else
                 tbd = Left;
         }
         filterToolBar = new QPEToolBar ( this );
         filterMenubar = new KMenuBar( 0 );
         QFontMetrics fm ( filterMenubar->font() );
 #ifndef DESKTOP_VERSION    
         filterToolBar->setFocusPolicy( NoFocus );
         filterMenubar->setFocusPolicy( NoFocus );
 #endif     
         filterPopupMenu = new QPopupMenu( this );
         filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0  );
         QString addTest = "A";  
         filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) );
 #ifdef DESKTOP_VERSION
         addTest = "AAAAAABBBCCCx"; 
 #else
         addTest = "AAAAAx";  
 #endif 
         filterMenubar->setMaximumWidth( fm.width( i18n("No Filter")+addTest ) );
         addToolBar (filterToolBar , tbd );
         connect ( filterPopupMenu , SIGNAL( activated ( int )  ), this, SLOT (selectFilterPopup( int ) ) );
         connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) );
         if ( !KOPrefs::instance()->mShowIconFilter && !p->mShowIconOnetoolbar )
             filterToolBar->hide();
     } else {
         filterToolBar = 0;
         filterMenubar  = 0;
         filterPopupMenu = 0;
     }
     if ( p->mShowIconOnetoolbar ) {
         viewToolBar = iconToolBar ;
         navigatorToolBar = iconToolBar ;
     } else {
 #ifndef DESKTOP_VERSION
         setToolBarsMovable( false );
 #endif
         if ( p->mToolBarHorV ) {
             if ( p->mToolBarUpV )
                 tbd = Bottom;
             else
                 tbd = Top;
         }
         else {
             if ( p->mToolBarUpV )
                 tbd = Right;
             else
                 tbd = Left;
         }
         viewToolBar = new QPEToolBar( this );
         addToolBar (viewToolBar , tbd );
         if ( p->mToolBarHorN ) {
             if ( p->mToolBarUpN )
                 tbd = Bottom;
             else
                 tbd = Top;
         }
         else {
             if ( p->mToolBarUpN )
                 tbd = Right;
             else
                 tbd = Left;
         }
         navigatorToolBar = new QPEToolBar( this );
         addToolBar (navigatorToolBar , tbd );
     }
 
   
 
     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
 
     //qDebug("Mainwidget x %d y %d w %d  h %d",  x(), y(), width(), height ());
     setDefaultPreferences();
     mCalendar = new CalendarLocal();
     mView = new CalendarView( mCalendar, this,"mCalendar " );
-    mView->hide();
+    setCentralWidget( mView );
+    //mView->hide();
     //mView->resize(splash->size() );
     initActions(); 
     mSyncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)mView, KSyncManager::KOPI, KOPrefs::instance(), syncMenu);
     mSyncManager->setBlockSave(false);
     mView->setSyncManager(mSyncManager);
 #ifndef DESKTOP_VERSION
     iconToolBar->show();
     qApp->processEvents();
 #endif
     //qDebug("Splashwidget x %d y %d w %d  h %d", splash-> x(), splash->y(), splash->width(),splash-> height ());
     int vh = height() ;
     int vw = width();
     //qDebug("Toolbar hei %d ",iconToolBar->height() );
     if ( iconToolBar->orientation () == Qt:: Horizontal ) {
         vh -=  iconToolBar->height();
     } else {
         vw -= iconToolBar->height();
     }
     //mView->setMaximumSize( splash->size() );
     //mView->resize( splash->size() );
     //qDebug("MainView x %d y %d w %d  h %d",  mView->x(),mView-> y(), mView->width(), mView->height ());
     mView->readSettings();
     bool newFile = false;
     if( !QFile::exists( defaultFileName() ) ) {
         QFileInfo finfo ( defaultFileName() );
         QString oldFile = QDir::convertSeparators(  QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics");
         QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n";
         finfo.setFile( oldFile );
         if (finfo.exists() ) {
             KMessageBox::information( this, message);
             mView->openCalendar( oldFile );
             qApp->processEvents();
         } else {
             oldFile = QDir::convertSeparators(  QDir::homeDirPath()+"/korganizer/mycalendar.ics");
             finfo.setFile( oldFile );
             if (finfo.exists() ) {
                 KMessageBox::information( this, message);
                 mView->openCalendar( oldFile );
                 qApp->processEvents();
             }
         }
         mView->saveCalendar( defaultFileName() );
         newFile = true;
     }
 
     //QTime neededSaveTime = QDateTime::currentDateTime().time();
     //mView->loadCalendars();
     //int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
     //qDebug("KO: Calendar loading time: %d ms",msNeeded );
 
     if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) {
         KOPrefs::instance()->setAllDefaults();
     }
 
 
     connect( mView, SIGNAL( tempDisableBR(bool) ),
              SLOT( disableBR(bool) ) );
     connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) );
     setCentralWidget( mView );
     globalFlagBlockStartup = 0;
-    mView->show();
-    delete splash;
+    //mView->show();
+    //delete splash;
     if ( newFile )
         mView->updateConfig();
     // qApp->processEvents();
     //qDebug("MainView x %d y %d w %d  h %d",  mView->x(),mView-> y(), mView->width(), mView->height ());
     //fillSyncMenu();
    
     
     connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) );
     connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) );
     connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) );
     connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
     mSyncManager->setDefaultFileName( sentSyncFile()); 
     connect ( syncMenu, SIGNAL( activated ( int )  ), mSyncManager, SLOT (slotSyncMenu( int ) ) );
     mSyncManager->fillSyncMenu();
 
 
 
     mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins  );
     if ( showWarning ) {
         KMessageBox::information( this,
                          "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information");
         qApp->processEvents();
         mView->dialogManager()->showSyncOptions();
     }
 
   //US listen for result adressed from Ka/Pi
 
 #ifndef DESKTOP_VERSION
     infrared = 0;
 #endif
     updateFilterToolbar();
     updateWeek( mView->startDate() );
     connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ),
              SLOT( updateWeekNum( const KCal::DateList & ) ) );
     mBRdisabled = false;
     //toggleBeamReceive();
 
     setCaption(i18n("Loading calendar files ... please wait" ));
     QTimer::singleShot( 10, this, SLOT ( loadDataAfterStart() ));
 }
 MainWindow::~MainWindow()
 {
     //qDebug("MainWindow::~MainWindow() ");
     //save toolbar location
     delete mCalendar;
     delete mSyncManager;
 #ifndef DESKTOP_VERSION
     if ( infrared )
         delete infrared;
 #endif
 
 
 }
 
 void  MainWindow::loadDataAfterStart()
 {
     
     qDebug("KO: Start loading files..." );
     QTime neededSaveTime = QDateTime::currentDateTime().time();
     mView->loadCalendars();
     int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
     qDebug("KO: Calendar loading time: %d ms",msNeeded );
     //QTimer::singleShot( 1000, mView, SLOT ( checkFiles() ));
     mView->setModified( false );
     mBlockAtStartup = false;
     mView->setModified( false );
     connect(mView , SIGNAL( save() ), this, SLOT( save() ) );
     processIncidenceSelection( 0 );
     connect( mView, SIGNAL( incidenceSelected( Incidence * ) ),
              SLOT( processIncidenceSelection( Incidence * ) ) );
     connect( mView, SIGNAL( modifiedChanged( bool ) ),
              SLOT( slotModifiedChanged( bool ) ) );
 
 #ifndef DESKTOP_VERSION
     connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
     connect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(recieve(  const QCString&, const QByteArray& )));
     disconnect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(receiveStart(  const QCString&, const QByteArray& )));
     if ( !mCStringMess.isEmpty() ) 
         recieve( mCStringMess, mByteData );
 #endif
 
 
     QTimer::singleShot( 1000, mView, SLOT ( checkFiles() ));
 }
 
 void MainWindow::slotResetFocus()
 {
     //qDebug(" CalendarView::slotResetFocus() %x  %x %x %x", qApp->focusWidget(), menuBar1, mView,iconToolBar);
     mFocusLoop = 3;
     QTimer::singleShot( 0, this, SLOT(slotResetFocusLoop()  ));
 }
 void MainWindow::slotResetFocusLoop()
 {
     --mFocusLoop;
     QWidget* fw = mView->viewManager()->currentView();
     if ( fw ) {
         //qDebug("loop ");
         fw->setFocus();
         if ( qApp->focusWidget() != fw && mFocusLoop > 0 )
             QTimer::singleShot( 0, this, SLOT(slotResetFocusLoop()  ));
     }
         
 }
 void MainWindow::disableBR(bool b)
 {
 #ifndef DESKTOP_VERSION
     if ( b ) {
         if ( infrared ) {
             toggleBeamReceive();
             mBRdisabled = true;
         }
         mBRdisabled = true;
     } else {
         if ( mBRdisabled ) {
             mBRdisabled = false;
             //makes no sense,because other cal ap is probably running
             // toggleBeamReceive(); 
         }
     }
 #endif
 
 }
 bool MainWindow::beamReceiveEnabled()
 {
 #ifndef DESKTOP_VERSION
     return ( infrared != 0 );
 #endif
     return false;
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
@@ -1290,263 +1290,263 @@ void KToolBar::mousePressEvent ( QMouseEvent *m )
                 break;
             default:
                 if ( i >= CONTEXT_ICONSIZES )
                     setIconSize( i - CONTEXT_ICONSIZES );
                 else
                     return; // assume this was an action handled elsewhere, no need for setSettingsDirty()
             }
 /*US            
             if ( mw->inherits("KMainWindow") )
                 static_cast<KMainWindow *>(mw)->setSettingsDirty();
 */                
         }
     }
 }
 
 
 void KToolBar::rebuildLayout()
 {
  
     for(QWidget *w=d->idleButtons.first(); w; w=d->idleButtons.next())
        w->blockSignals(false);
     d->idleButtons.clear();
 
     layoutTimer->stop();
     QApplication::sendPostedEvents( this, QEvent::ChildInserted );
     QBoxLayout *l = boxLayout();
     l->setMargin( 1 );
     // clear the old layout
     QLayoutIterator it = l->iterator();
     
     while ( it.current() ) {
         it.deleteCurrent();
     }
         for ( QWidget *w = widgets.first(); w; w = widgets.next() ) {
         if ( w == rightAligned ) {
             continue;
         }
         if ( w->inherits( "KToolBarSeparator" ) &&
              !( (KToolBarSeparator*)w )->showLine() ) {
             l->addSpacing( 6 );
             w->hide();
             continue;
         }
         if ( w->inherits( "QPopupMenu" ) )
             continue;
         l->addWidget( w );
         w->show();
     }
     if ( rightAligned ) {
         l->addStretch();
         l->addWidget( rightAligned );
         rightAligned->show();
     }
 
     if ( fullSize() ) {
         // This code sucks. It makes the last combo in a toolbar VERY big (e.g. zoom combo in kword).
         //if ( !stretchableWidget && widgets.last() &&
         //     !widgets.last()->inherits( "QButton" ) && !widgets.last()->inherits( "KAnimWidget" ) )
         //    setStretchableWidget( widgets.last() );
         if ( !rightAligned )
             l->addStretch();
         if ( stretchableWidget )
             l->setStretchFactor( stretchableWidget, 10 );
     }
     l->invalidate();
     QApplication::postEvent( this, new QEvent( QEvent::LayoutHint ) );
     //#endif //DESKTOP_VERSION
 }
 
 void KToolBar::childEvent( QChildEvent *e )
 {
 
     if ( e->child()->isWidgetType() ) {
         QWidget * w = (QWidget*)e->child();
         if ( e->type() == QEvent::ChildInserted ) {
             if ( !e->child()->inherits( "QPopupMenu" ) &&
                  ::qstrcmp( "qt_dockwidget_internal", e->child()->name() ) != 0 ) {
 
                 // prevent items that have been explicitly inserted by insert*() from
                 // being inserted again
                 if ( !widget2id.contains( w ) )
                 {
                     int dummy = -1;
                     insertWidgetInternal( w, dummy, -1 );
                 }
             }
         } else {
             removeWidgetInternal( w );
         }
         if ( isVisibleTo( 0 ) )
         {
             QBoxLayout *l = boxLayout();
             // QLayout *l = layout();
 
             // clear the old layout so that we don't get unnecassery layout
             // changes till we have rebuild the thing
             QLayoutIterator it = l->iterator();
             while ( it.current() ) {
                it.deleteCurrent();
             }
             layoutTimer->start( 50, TRUE );
         }
     }
     QToolBar::childEvent( e );
 }
 
 void KToolBar::insertWidgetInternal( QWidget *w, int &index, int id )
 {
     // we can't have it in widgets, or something is really wrong
     //widgets.removeRef( w );
 
     connect( w, SIGNAL( destroyed() ),
              this, SLOT( widgetDestroyed() ) );
     if ( index == -1 || index > (int)widgets.count() ) {
         widgets.append( w );
         index = (int)widgets.count();
     }
     else
         widgets.insert( index, w );
     if ( id == -1 )
         id = id2widget.count();
     id2widget.insert( id, w );
     widget2id.insert( w, id );
 }
 void KToolBar::repaintMe()
 {
     setUpdatesEnabled( true );
     QToolBar::repaint( true );
-    //qDebug(" KToolBar::repaintMe() ");
+    qDebug(" KToolBar::repaintMe() ");
 }
 
 void KToolBar::showEvent( QShowEvent *e )
 {
-    QToolBar::showEvent( e );
     rebuildLayout();
+    QToolBar::showEvent( e );
 }
 
 void KToolBar::setStretchableWidget( QWidget *w )
 {
     QToolBar::setStretchableWidget( w );
     stretchableWidget = w;
 }
 
 QSizePolicy KToolBar::sizePolicy() const
 {
     if ( orientation() == Horizontal )
         return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed );
     else
         return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Expanding );
 }
 
 QSize KToolBar::sizeHint() const
 {
     return QToolBar::sizeHint();
 #if 0
     QWidget::polish();
     static int iii = 0;
     ++iii;
     qDebug("++++++++ KToolBar::sizeHint() %d ", iii );
     int margin = static_cast<QWidget*>(ncThis)->layout()->margin();
     switch( barPos() )
     {
      case KToolBar::Top:
      case KToolBar::Bottom:
        for ( QWidget *w = widgets.first(); w; w =widgets.next() )
        {
           if ( w->inherits( "KToolBarSeparator" ) &&
              !( static_cast<KToolBarSeparator*>(w)->showLine() ) )
           {
              minSize += QSize(6, 0);
           }
           else
           {
              QSize sh = w->sizeHint();
              if (!sh.isValid())
                 sh = w->minimumSize();
              minSize = minSize.expandedTo(QSize(0, sh.height()));
              minSize += QSize(sh.width()+1, 0);
           }
        }
 /*US       
        minSize += QSize(QApplication::style().pixelMetric( QStyle::PM_DockWindowHandleExtent ), 0);
 */       
        minSize += QSize(margin*2, margin*2);
        break;
 
      case KToolBar::Left:
      case KToolBar::Right:
        for ( QWidget *w = widgets.first(); w; w = widgets.next() )
        {
           if ( w->inherits( "KToolBarSeparator" ) &&
              !( static_cast<KToolBarSeparator*>(w)->showLine() ) )
           {
              minSize += QSize(0, 6);
           }
           else
           {
              QSize sh = w->sizeHint();
              if (!sh.isValid())
                 sh = w->minimumSize();
              minSize = minSize.expandedTo(QSize(sh.width(), 0));
              minSize += QSize(0, sh.height()+1);
           }
        }
 /*US       
        minSize += QSize(0, QApplication::style().pixelMetric( QStyle::PM_DockWindowHandleExtent ));
 */       
        minSize += QSize(margin*2, margin*2);
        break;
 
      default:
        minSize = QToolBar::sizeHint();
        break;
     }
     return minSize;
 #endif
 }
 
 QSize KToolBar::minimumSize() const
 {
     return minimumSizeHint();
 }
 
 QSize KToolBar::minimumSizeHint() const
 {
     return sizeHint();
 }
 
 bool KToolBar::highlight() const
 {
     return d->m_highlight;
 }
 
 void KToolBar::hide()
 {
     QToolBar::hide();
 }
 
 void KToolBar::show()
 {
     QToolBar::show();
 }
 
 void KToolBar::resizeEvent( QResizeEvent *e )
 {
     bool b = isUpdatesEnabled();
     setUpdatesEnabled( FALSE );
     QToolBar::resizeEvent( e );
     if (b)
        d->repaintTimer.start( 100, true );
 }
 
 void KToolBar::slotIconChanged(int group)
 {
     if ((group != KIcon::Toolbar) && (group != KIcon::MainToolbar))
         return;
     if ((group == KIcon::MainToolbar) != !::qstrcmp(name(), "mainToolBar"))
         return;
 
     emit modechange();
     if (isVisible())
         updateGeometry();
 }