fix

1 files changed, 5 insertions, 1 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 4e2523e..033e537 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -755,240 +755,244 @@ void KABCore::sendMail()
 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->repaint();
 }
 void KABCore::resizeEvent(QResizeEvent* e )
 {
-    if ( !mMiniSplitter )
+    if ( !mMiniSplitter ) {
+        QWidget::resizeEvent( e );
         return;
+    }
+#ifndef DESKTOP_VERSION
     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();
                 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 );
                 }
                 if ( shot )
                     QTimer::singleShot( 1, this , SLOT ( updateMainWindow()));
             }
         }
     }
     desktop_width = QApplication::desktop()->width();
+#endif
     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;