fixx

5 files changed, 12 insertions, 11 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 77321aa..af12f2b 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -27,787 +27,787 @@ Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include "kabcore.h"
 
 #include <stdaddressbook.h>
 #include <klocale.h>
 #include <kfiledialog.h>
 #include <qtimer.h>
 #include <qlabel.h>
 #include <qregexp.h>
 #include <qlineedit.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
 #include <qprogressbar.h>
 #include <libkdepim/phoneaccess.h>
 
 #ifndef KAB_EMBEDDED
 #include <qclipboard.h>
 #include <qdir.h> 
 #include <qfile.h>
 #include <qapplicaton.h>
 #include <qprogressbar.h>
 #include <qlayout.h>
 #include <qregexp.h>
 #include <qvbox.h>
 #include <kabc/addresseelist.h>
 #include <kabc/errorhandler.h>
 #include <kabc/resource.h>
 #include <kabc/vcardconverter.h>
 #include <kapplication.h>
 #include <kactionclasses.h>
 #include <kcmultidialog.h>
 #include <kdebug.h>
 #include <kdeversion.h>
 #include <kkeydialog.h>
 #include <kmessagebox.h>
 #include <kprinter.h>
 #include <kprotocolinfo.h>
 #include <kresources/selectdialog.h>
 #include <kstandarddirs.h>
 #include <ktempfile.h>
 #include <kxmlguiclient.h>
 #include <kaboutdata.h>
 #include <libkdepim/categoryselectdialog.h>
 
 #include "addresseeutil.h"
 #include "addresseeeditordialog.h"
 #include "extensionmanager.h"
 #include "kstdaction.h"
 #include "kaddressbookservice.h"
 #include "ldapsearchdialog.h"
 #include "printing/printingwizard.h"
 #else // KAB_EMBEDDED
 
 #include <kapplication.h>
 #include "KDGanttMinimizeSplitter.h"
 #include "kaddressbookmain.h"
 #include "kactioncollection.h"
 #include "addresseedialog.h"
 //US
 #include <addresseeview.h>
 
 #include <qapp.h>
 #include <qmenubar.h>
 //#include <qtoolbar.h>
 #include <qmessagebox.h>
 #include <kdebug.h>
 #include <kiconloader.h> // needed for SmallIcon
 #include <kresources/kcmkresources.h>
 #include <ktoolbar.h>
 #include <kprefsdialog.h>
 
 
 //#include <qlabel.h>
 
 
 #ifndef DESKTOP_VERSION
 #include <qpe/ir.h>
 #include <qpe/qpemenubar.h>
 #include <qtopia/qcopenvelope_qws.h>
 #else
 
 #include <qmenubar.h>
 #endif
 
 #endif // KAB_EMBEDDED
 #include "kcmconfigs/kcmkabconfig.h"
 #include "kcmconfigs/kcmkdepimconfig.h"
 #include "kpimglobalprefs.h"
 #include "externalapphandler.h"
 #include "xxportselectdialog.h"
 
 
 #include <kresources/selectdialog.h>
 #include <kmessagebox.h>
 
 #include <picture.h>
 #include <resource.h>
 
 //US#include <qsplitter.h>
 #include <qmap.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qvbox.h>
 #include <qlayout.h>
 #include <qclipboard.h>
 #include <qtextstream.h>
 #include <qradiobutton.h>
 #include <qbuttongroup.h>
 
 #include <libkdepim/categoryselectdialog.h>
 #include <libkdepim/categoryeditdialog.h>
 #include <kabc/vcardconverter.h>
 
 
 #include "addresseeutil.h"
 #include "undocmds.h"
 #include "addresseeeditordialog.h"
 #include "viewmanager.h"
 #include "details/detailsviewcontainer.h"
 #include "kabprefs.h"
 #include "xxportmanager.h"
 #include "incsearchwidget.h"
 #include "jumpbuttonbar.h"
 #include "extensionmanager.h"
 #include "addresseeconfig.h"
 #include "nameeditdialog.h"
 #include <kcmultidialog.h>
 
 #ifdef _WIN32_
 #ifdef  _OL_IMPORT_
 #include "kaimportoldialog.h"
 #endif
 #else
 #include <unistd.h>
 #endif
 // sync includes
 #include <libkdepim/ksyncprofile.h>
 #include <libkdepim/ksyncprefsdialog.h>
 
 
 class KABCatPrefs : public QDialog
 {
   public:
     KABCatPrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Manage new Categories") );
         QVBoxLayout* lay = new QVBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QLabel * lab = new QLabel( i18n("After importing/loading/syncing\nthere may be new categories in\naddressees\nwhich are not in the category list.\nPlease choose what to do:\n "), this );
         lay->addWidget( lab ); 
         QButtonGroup* format = new  QButtonGroup( 1, Horizontal, i18n("New categories not in list:"), this );
         lay->addWidget( format ); 
         format->setExclusive ( true ) ;
         addCatBut = new QRadioButton(i18n("Add to category list"), format );
         new QRadioButton(i18n("Remove from addressees"), format );
         addCatBut->setChecked( true );
         QPushButton * ok = new QPushButton( i18n("OK"), this );
         lay->addWidget( ok );
         QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
         lay->addWidget( cancel );
         connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
         connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
         resize( 200, 200 );
     }
       
     bool addCat() { return addCatBut->isChecked(); }
 private:
     QRadioButton* addCatBut;
 };
 
 class KABFormatPrefs : public QDialog
 {
   public:
     KABFormatPrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Set formatted name") );
         QVBoxLayout* lay = new QVBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QLabel * lab = new QLabel( i18n("You can set the formatted name\nfor a list of contacts in one go."), this );
         lay->addWidget( lab ); 
         QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("Set formatted name to:"), this );
         lay->addWidget( format ); 
         format->setExclusive ( true ) ;
         simple = new QRadioButton(i18n("Simple: James Bond"), format );
         full = new QRadioButton(i18n("Full: Mr. James 007 Bond I"), format );
         reverse = new QRadioButton(i18n("Reverse: Bond, James"), format );
         company = new QRadioButton(i18n("Organization: MI6"), format );
         simple->setChecked( true );
         setCompany = new QCheckBox(i18n("Set formatted name to\norganization, if name empty"), this);
         lay->addWidget( setCompany );
         QPushButton * ok = new QPushButton( i18n("Select contact list"), this );
         lay->addWidget( ok );
         QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
         lay->addWidget( cancel );
         connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
         connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
         //resize( 200, 200 );
        
     }
 public:
     QRadioButton* simple, *full, *reverse, *company;
     QCheckBox* setCompany;
 };
 
 
 
 class KAex2phonePrefs : public QDialog
 {
   public:
     KAex2phonePrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Export to phone options") );
         QVBoxLayout* lay = new QVBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QLabel *lab;
         lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) );  
         lab->setAlignment (AlignHCenter  ); 
         QHBox* temphb;
         temphb = new QHBox( this );
         new QLabel( i18n("I/O device: "), temphb ); 
         mPhoneDevice = new QLineEdit( temphb);
         lay->addWidget( temphb );
         temphb = new QHBox( this );
         new QLabel( i18n("Connection: "), temphb ); 
         mPhoneConnection = new QLineEdit( temphb);
         lay->addWidget( temphb );
         temphb = new QHBox( this );
         new QLabel( i18n("Model(opt.): "), temphb ); 
         mPhoneModel = new QLineEdit( temphb);
         lay->addWidget( temphb );
         // mWriteToSim = new QCheckBox( i18n("Write Contacts to SIM card\n(if not, write to phone memory)"), this );
         // lay->addWidget( mWriteToSim );
         lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ncontact data on phone!"), this ) );  
         lab->setAlignment (AlignHCenter); 
         QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this );
         lay->addWidget( ok );
         QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
         lay->addWidget( cancel );
         connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
         connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
         resize( 220, 240 );
         
     }
    
 public:
     QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; 
     QCheckBox* mWriteToSim;
 };
 
 
 bool pasteWithNewUid = true;
 
 #ifdef KAB_EMBEDDED
 KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name )
   : QWidget( parent, name ), KSyncInterface(), mGUIClient( client ), mViewManager( 0 ),
     mExtensionManager( 0 ),mConfigureDialog( 0 ),/*US  mLdapSearchDialog( 0 ),*/
     mReadWrite( readWrite ), mModified( false ), mMainWindow(client)
 #else //KAB_EMBEDDED
 KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const char *name )
   : QWidget( parent, name ), KSyncInterface(), mGUIClient( client ), mViewManager( 0 ),
     mExtensionManager( 0 ), mConfigureDialog( 0 ), mLdapSearchDialog( 0 ),
     mReadWrite( readWrite ), mModified( false )
 #endif //KAB_EMBEDDED
 {
   //  syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu);
   //  syncManager->setBlockSave(false);
   mIncSearchWidget = 0;
     mMiniSplitter = 0;
   mExtensionBarSplitter = 0;
   mIsPart = !parent->inherits( "KAddressBookMain" );
   mAddressBook = KABC::StdAddressBook::selfNoLoad();
   KABC::StdAddressBook::setAutomaticSave( false );
 
 #ifndef KAB_EMBEDDED
   mAddressBook->setErrorHandler( new KABC::GUIErrorHandler );
 #endif //KAB_EMBEDDED
 
   connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook * ) ),
            SLOT( addressBookChanged() ) );
 
 #if 0
   // LR moved to addressbook init method
   mAddressBook->addCustomField( i18n( "Department" ), KABC::Field::Organization,
                                 "X-Department", "KADDRESSBOOK" );
   mAddressBook->addCustomField( i18n( "Profession" ), KABC::Field::Organization,
                                 "X-Profession", "KADDRESSBOOK" );
   mAddressBook->addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization,
                                 "X-AssistantsName", "KADDRESSBOOK" );
   mAddressBook->addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization,
                                 "X-ManagersName", "KADDRESSBOOK" );
   mAddressBook->addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal,
                                 "X-SpousesName", "KADDRESSBOOK" );
   mAddressBook->addCustomField( i18n( "Office" ), KABC::Field::Personal,
                                 "X-Office", "KADDRESSBOOK" );
   mAddressBook->addCustomField( i18n( "IM Address" ), KABC::Field::Personal,
                                 "X-IMAddress", "KADDRESSBOOK" );
   mAddressBook->addCustomField( i18n( "Anniversary" ), KABC::Field::Personal,
                                 "X-Anniversary", "KADDRESSBOOK" );
 
   //US added this field to become compatible with Opie/qtopia addressbook
   // values can be "female" or "male" or "". An empty field represents undefined.
   mAddressBook->addCustomField( i18n( "Gender" ), KABC::Field::Personal,
                                 "X-Gender", "KADDRESSBOOK" );
   mAddressBook->addCustomField( i18n( "Children" ), KABC::Field::Personal,
                                 "X-Children", "KADDRESSBOOK" );
   mAddressBook->addCustomField( i18n( "FreeBusyUrl" ), KABC::Field::Personal,
                                 "X-FreeBusyUrl", "KADDRESSBOOK" );
 #endif
   initGUI();
 
   mIncSearchWidget->setFocus();
 
 
   connect( mViewManager, SIGNAL( selected( const QString& ) ),
            SLOT( setContactSelected( const QString& ) ) );
   connect( mViewManager, SIGNAL( executed( const QString& ) ),
            SLOT( executeContact( const QString& ) ) );
 
   connect( mViewManager, SIGNAL( deleteRequest( ) ),
            SLOT( deleteContacts( ) ) );
   connect( mViewManager, SIGNAL( modified() ),
            SLOT( setModified() ) );
 
   connect( mExtensionManager, SIGNAL( modified( const KABC::Addressee::List& ) ), this, SLOT( extensionModified( const KABC::Addressee::List& ) ) );
   connect( mExtensionManager, SIGNAL( changedActiveExtension( int ) ), this, SLOT( extensionChanged( int ) ) );
 
   connect( mXXPortManager, SIGNAL( modified() ),
            SLOT( setModified() ) );
 
   connect( mJumpButtonBar, SIGNAL( jumpToLetter( const QString& ) ),
            SLOT( incrementalSearchJump( const QString& ) ) );
   connect( mIncSearchWidget, SIGNAL( fieldChanged() ),
            mJumpButtonBar, SLOT( recreateButtons() ) );
 
   connect( mDetails, SIGNAL( sendEmail( const QString& ) ),
            SLOT( sendMail( const QString& ) ) );
 
 
   connect( ExternalAppHandler::instance(), SIGNAL (requestForNameEmailUidList(const QString&, const QString&)),this, SLOT(requestForNameEmailUidList(const QString&, const QString&)));
   connect( ExternalAppHandler::instance(), SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)),this, SLOT(requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)));
   connect( ExternalAppHandler::instance(), SIGNAL (requestForBirthdayList(const QString&, const QString&)),this, SLOT(requestForBirthdayList(const QString&, const QString&)));
   connect( ExternalAppHandler::instance(), SIGNAL (nextView()),this, SLOT(setDetailsToggle()));
   connect( ExternalAppHandler::instance(), SIGNAL (doRingSync()),this, SLOT( doRingSync()));
   connect( ExternalAppHandler::instance(), SIGNAL (callContactdialog()),this, SLOT(callContactdialog()));
 
 
 #ifndef KAB_EMBEDDED
   connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ),
            mXXPortManager, SLOT( importVCard( const KURL& ) ) );
 
   connect( mDetails, SIGNAL( browse( const QString& ) ),
            SLOT( browse( const QString& ) ) );
 
 
   mAddressBookService = new KAddressBookService( this );
 
 #endif //KAB_EMBEDDED
 
   mMessageTimer = new QTimer( this ); 
   connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) );
   mEditorDialog = 0;
   createAddresseeEditorDialog( this );
   setModified( false );  
   mBRdisabled = false;
 #ifndef DESKTOP_VERSION
   infrared  = 0;
 #endif
   //toggleBeamReceive( );
   mMainWindow->toolBar()->show();
   // we have a toolbar repainting error on the Zaurus when starting KA/Pi
   //QTimer::singleShot( 10, this , SLOT ( updateToolBar())); 
     QTimer::singleShot( 100, this, SLOT ( loadDataAfterStart() ));
 }
 void KABCore::receiveStart( const QCString& cmsg, const QByteArray& data )
 {
-    qDebug("KO: QCOP start message received: %s ", cmsg.data()  );
+    //qDebug("KO: QCOP start message received: %s ", cmsg.data()  );
     mCStringMess = cmsg;
     mByteData = data;
 }
 
 void  KABCore::loadDataAfterStart()
 {
-    qDebug("KABCore::loadDataAfterStart() ");
+    //qDebug("KABCore::loadDataAfterStart() ");
     ((StdAddressBook*)mAddressBook)->init( true );
         mViewManager->refreshView();
 
 #ifndef DESKTOP_VERSION  
         disconnect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT (receiveStart ( const QCString &, const QByteArray & )));
         
       QObject::connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
       if ( !mCStringMess.isEmpty() ) 
           ExternalAppHandler::instance()->appMessage( mCStringMess, mByteData );
 #endif
-    QTimer::singleShot( 10, this , SLOT ( updateToolBar())); 
+      // QTimer::singleShot( 10, this , SLOT ( updateToolBar())); 
     setCaptionBack();
 }
 void KABCore::updateToolBar()
 {
     static int iii = 0;
     ++iii;
     mMainWindow->toolBar()->repaintMe();
     if ( iii < 4 )
         QTimer::singleShot( 100*iii, this , SLOT ( updateToolBar())); 
 }
 KABCore::~KABCore()
 {
     //  save();
     //saveSettings();
     //KABPrefs::instance()->writeConfig();
     delete AddresseeConfig::instance();
     mAddressBook = 0;
     KABC::StdAddressBook::close();
     
     delete syncManager;
 #ifndef DESKTOP_VERSION
     if ( infrared )
         delete infrared;
 #endif
 }
 void KABCore::receive( const QCString& cmsg, const QByteArray& data )
 {
     //qDebug("KA: QCOP message received: %s ", cmsg.data()  );
     if ( cmsg == "setDocument(QString)" ) {
         QDataStream stream( data, IO_ReadOnly );
         QString fileName;
         stream >> fileName;
         recieve( fileName );
         return;
     }
 }
 void KABCore::toggleBeamReceive( )
 {
     if ( mBRdisabled  )
         return;
 #ifndef DESKTOP_VERSION
     if ( infrared ) {
         qDebug("KA: AB disable BeamReceive ");
         delete infrared;
         infrared = 0;
         mActionBR->setChecked(false);
         return;
     } 
     qDebug("KA: AB enable BeamReceive ");
     mActionBR->setChecked(true);
 
     infrared = new QCopChannel("QPE/Application/addressbook",this, "channelAB" ) ;   
     QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(receive(  const QCString&, const QByteArray& )));
 #endif
 }
 
 
 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() ");
 }
 
 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(", ") );
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp
index 8fe3ee0..c417226 100644
--- a/kaddressbook/kaddressbookmain.cpp
+++ b/kaddressbook/kaddressbookmain.cpp
@@ -1,241 +1,241 @@
 /*
     This file is part of KAddressbook.
     Copyright (c) 1999 Don Sanders <dsanders@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #ifdef KAB_EMBEDDED
 #include "kabprefs.h"
 #include <kglobal.h>
 #include <qmessagebox.h>
 #include <qtoolbar.h>
 #include <qapplication.h>
 #else //KAB_EMBEDDED
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
 #include <kmessagebox.h>
 #include <kstatusbar.h>
 #endif //KAB_EMBEDDED
 #include <klocale.h>
 
 #include "kabcore.h"
 #include "kaddressbookmain.h"
 #include "kactioncollection.h"
 
 #ifdef KAB_EMBEDDED
-KAddressBookMain::KAddressBookMain() : KMainWindow( 0, "adrressbook" )
+KAddressBookMain::KAddressBookMain() : KMainWindow( 0, "abmain" )
 #else //KAB_EMBEDDED
 //MOC_SKIP_BEGIN
 KAddressBookMain::KAddressBookMain() : DCOPObject( "KAddressBookIface" ), KMainWindow( 0 ) 
 //MOC_SKIP_END
 #endif //KAB_EMBEDDED
 {
     setIcon(SmallIcon( "ka24" )  );
 #if 0
   //US for embedded systems, create the toolbar before we initiate KABCore.
   // KABCore will fill the toolbar with menues and icons
   QMainWindow::ToolBarDock tbd;
   tbd = Top;
   iconToolBar = new QToolBar( this );
   addToolBar (iconToolBar , tbd );
   iconToolBar->setHorizontalStretchable(true);  
 //US  iconToolBar->setWidth(300);
 #endif // 0
 
   mCore = new KABCore( this, true, this );
   
 #ifdef KAB_EMBEDDED
   setCaption( i18n( "KAddressbook/Pi" ) );
 #else //KAB_EMBEDDED
   setCaption( i18n( "Address Book Browser" ) );
 #endif //KAB_EMBEDDED
 
   //mCore->restoreSettings();
 
   initActions();
 
   setCentralWidget( mCore );
 
 //US  statusBar()->show();
 
 #ifndef KAB_EMBEDDED
   setStandardToolBarMenuEnabled(true);
   
   createGUI( "kaddressbookui.rc", false );
 
 
 #endif //KAB_EMBEDDED
   setAutoSaveSettings();
   mCore->restoreSettings();
 #ifndef DESKTOP_VERSION
       QObject::connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), mCore, SLOT (receiveStart ( const QCString &, const QByteArray & )));
 #endif
 }
 
 KAddressBookMain::~KAddressBookMain()
 {
     // mCore->saveSettings();
 }
 
 void KAddressBookMain::showMinimized () 
 {
     QWidget::showMinimized () ;
 }
 void KAddressBookMain::addEmail( QString addr )
 {
   mCore->addEmail( addr );
 }
 
 #ifndef KAB_EMBEDDED
 ASYNC KAddressBookMain::showContactEditor( QString uid )
 {
   mCore->editContact( uid );
 }
 #endif //KAB_EMBEDDED
 void KAddressBookMain::newContact()
 {
   mCore->newContact();
 }
 
 QString KAddressBookMain::getNameByPhone( QString phone )
 {
   return mCore->getNameByPhone( phone );
 }
 
 void KAddressBookMain::save()
 {
   mCore->save();
 }
 
 void KAddressBookMain::exit()
 {
   close( );
 }
 
 void KAddressBookMain::saveProperties( KConfig* )
 {
 }
 
 void KAddressBookMain::readProperties( KConfig* )
 {
 }
 
 void KAddressBookMain::initActions()
 {
 #ifndef KAB_EMBEDDED
   KStdAction::quit( this, SLOT( close() ), actionCollection() );
   KStdAction::configureToolbars( this, SLOT( configureToolbars() ), actionCollection() );
 #else //KAB_EMBEDDED
   //US: transfered the setup of the actions into KABCore
 #endif //KAB_EMBEDDED
 
   
 }
 
 //US new method to setup menues and toolbars on embedded systems
 #ifdef KAB_EMBEDDED
 /*
 QToolBar * KAddressBookMain::getIconToolBar()
 {
   return iconToolBar;
 }
 */
 
 void KAddressBookMain::createGUI()
 {
 
 
     
 }
 #endif //KAB_EMBEDDED
 
 void KAddressBookMain::configureToolbars()
 {
 #ifndef KAB_EMBEDDED
   saveMainWindowSettings( KGlobal::config(), "MainWindow" );
 
   KEditToolbar dlg( factory() );
   connect( &dlg, SIGNAL( newToolbarConfig() ), SLOT( slotNewToolbarConfig() ) );
 
   dlg.exec();
 #else  //KAB_EMBEDDED
     qDebug("KAddressBookMain::configureToolbars() not implemented by ulf" );
 #endif //KAB_EMBEDDED
 }
 
 void KAddressBookMain::slotNewToolbarConfig()
 {
 #ifndef KAB_EMBEDDED
   applyMainWindowSettings( KGlobal::config(), "MainWindow" );
 #else  //KAB_EMBEDDED
     qDebug("KAddressBookMain::slotNewToolbarConfig() not implemented by ulf" );
 #endif //KAB_EMBEDDED
 }
 
 void KAddressBookMain::configureKeys()
 {
 #ifndef KAB_EMBEDDED
   KKeyDialog::configureKeys( actionCollection(), xmlFile(), true, this );
 #else  //KAB_EMBEDDED
     qDebug("KAddressBookMain::configureKeys() not implemented by ulf" );
 #endif //KAB_EMBEDDED
 }
 
 void KAddressBookMain::closeEvent( QCloseEvent* ce )
 {
   bool mModified = mCore->modified();
   bool mAskForQuit = KABPrefs::instance()->mAskForQuit;
 
   QString mess = i18n( "Close KA/Pi?");
   if ( mModified == true ) 
       mess += i18n( "\nChanges will be saved!");
   else
       mess += i18n( "\nNo unsaved changes detected!\nNothing will be  saved!");
 
   bool mQuit = true;
 
 
   if (mAskForQuit)
   { 
     
     int res = QMessageBox::information( this, "KA/Pi", mess , i18n("Yes!"), i18n("No"), 0, 0 );
     if (res == 0)
       mQuit = true;
     else
       mQuit = false;
   }
 
   if (mQuit == false)
     return;
 
   if (mModified == true)
   {
     save();
     mCore->saveSettings();
     //KABPrefs::instance()->writeConfig();
   }
 
   ce->accept();
 }
 
 #ifndef KAB_EMBEDDED
 #include "kaddressbookmain.moc"
 #endif //KAB_EMBEDDED
 
diff --git a/kmicromail/accountview.cpp b/kmicromail/accountview.cpp
index 4879d57..d1d4f7e 100644
--- a/kmicromail/accountview.cpp
+++ b/kmicromail/accountview.cpp
@@ -1,263 +1,263 @@
 
 #include "accountview.h"
 #include "accountitem.h"
 #include "selectstore.h"
 
 #include <libmailwrapper/settings.h>
 #include <libmailwrapper/mailwrapper.h>
 #include <libmailwrapper/mailtypes.h>
 #include <libmailwrapper/abstractmail.h>
 
 /* OPIE */
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qcheckbox.h>
 #include <qtimer.h>
 #include <qspinbox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
 using namespace Opie::Core;
 AccountView::AccountView( QWidget *parent, const char *name, WFlags flags )
         : QListView( parent, name, flags )
 {
     //connect( this, SIGNAL( selectionChanged(QListViewItem*) ),
     //       SLOT( refresh(QListViewItem*) ) );
     connect( this, SIGNAL( clicked(QListViewItem*) ),
            SLOT( refresh(QListViewItem*) ) );
     connect( this, SIGNAL( returnPressed(QListViewItem*) ),
            SLOT( refresh(QListViewItem*) ) );
      connect( this, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this,
           SLOT( slotHold(int,QListViewItem*,const QPoint&,int) ) );
     setSorting(0);
 }
 
 AccountView::~AccountView()
 {
     imapAccounts.clear();
     mhAccounts.clear();
 }
 
 void AccountView::slotContextMenu(int id)
 {
     AccountViewItem *view = static_cast<AccountViewItem *>(currentItem());
     if (!view) return;
     view->contextMenuSelected(id);
 }
 
 void AccountView::slotHold(int button, QListViewItem * item,const QPoint&,int)
 {
     if (button==1) {return;}
     if (!item) return;
     AccountViewItem *view = static_cast<AccountViewItem *>(item);
     QPopupMenu*m = view->getContextMenu();
     if (!m) return;
     connect(m,SIGNAL(activated(int)),this,SLOT(slotContextMenu(int)));
     m->setFocus();
     m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
     delete m;
 }
 
 void AccountView::populate( QList<Account> list )
 {
     clear();
 
     imapAccounts.clear();
     mhAccounts.clear();
 
     mhAccounts.append(new MHviewItem(AbstractMail::defaultLocalfolder(),this));
 
     Account *it;
     for ( it = list.first(); it; it = list.next() )
     {
         if ( it->getType() == MAILLIB::A_IMAP )
         {
             IMAPaccount *imap = static_cast<IMAPaccount *>(it);
             imapAccounts.append(new IMAPviewItem( imap, this ));
         }
         else if ( it->getType() == MAILLIB::A_POP3 )
         {
             POP3account *pop3 = static_cast<POP3account *>(it);
             /* must not be hold 'cause it isn't required */
             (void) new POP3viewItem( pop3, this );
         }
          else if ( it->getType() == MAILLIB::A_NNTP )
         {
             NNTPaccount *nntp = static_cast<NNTPaccount *>(it);
             /* must not be hold 'cause it isn't required */
             (void) new NNTPviewItem( nntp, this );
        }
      }
 }
 
 void AccountView::refresh(QListViewItem *item)
 {
     if ( item )
     {
         bool ask = true;
-        qDebug("text -%s- ",item->text( 0 ).latin1() );
+        //qDebug("text -%s- ",item->text( 0 ).latin1() );
         if ( item->text( 0 ) == i18n (" Local Mailfolders") )
             ask = false;
         else {
             if ( item->parent() )
                 if ( item->parent()->text( 0 ) == i18n (" Local Mailfolders") )
                     ask = false;
         }
         if ( ask ) {
             int result = KMessageBox::warningContinueCancel(this,
                                                         i18n("Refresh\n%1\n?").arg( item->text(0) ),
                                                         i18n("Refresh"),i18n("Refresh"),i18n("Cancel"),
                                                         true);
             if (result != KMessageBox::Continue) return;
         }
         m_currentItem = item;
         topLevelWidget()->setCaption( i18n ( "Refreshing %1 ... please wait" ). arg ( m_currentItem->text( 0 ) ) ) ;
         QTimer::singleShot( 500, this, SLOT ( refreshCurrentSelected() ) );
      
     }
 }
 void AccountView::refreshOutgoing()
 {
     m_currentItem = currentItem();
     if ( !m_currentItem ) return;
     AccountViewItem *view = static_cast<AccountViewItem *>(m_currentItem);
     if ( !view->getFolder() )
         return;
     QString bName = view->getFolder()->getDisplayName();
     if (bName.startsWith("/")&&bName.length()>1)
     {
         bName.replace(0,1,"");
     }
     int pos = bName.findRev("/");
     if (pos > 0)
     {
         bName.replace(0,pos+1,"");
     }
     //qDebug("name *%s* ",bName.lower().latin1() );
     if ( bName.lower() == "outgoing" || bName.lower() == "sent" ||  bName.lower() == "sendfailed" ) {
         refreshCurrent();
         // qDebug("refresh ");
     }
 }
 void AccountView::refreshCurrentSelected()
 {
     if ( !m_currentItem ) return;
     QValueList<RecMailP> headerlist;
     AccountViewItem *view = static_cast<AccountViewItem *>(m_currentItem);
     view->refresh(headerlist);
     emit refreshMailview(headerlist);
     topLevelWidget()->setCaption( i18n ( "KOpieMail/Pi" ) ) ;
 }
 
 void AccountView::refreshCurrent()
 {
     m_currentItem = currentItem();
     if ( !m_currentItem ) return;
     topLevelWidget()->setCaption( i18n ( "Refreshing %1 ... please wait" ). arg ( m_currentItem->text( 0 ) ) ) ;
     QTimer::singleShot( 500, this, SLOT ( refreshCurrentSelected() ) );
 }
 
 void AccountView::refreshAll()
 {
 }
 
 RecBodyP AccountView::fetchBody(const RecMailP&aMail)
 {
     QListViewItem*item = selectedItem ();
     if (!item) return new RecBody();
     AccountViewItem *view = static_cast<AccountViewItem *>(item);
     return view->fetchBody(aMail);
 }
 
 void AccountView::setupFolderselect(Selectstore*sels)
 {
 
 #ifndef DESKTOP_VERSION
     sels->showMaximized();
 #else
     sels->show();
 #endif
     QStringList sFolders;
     unsigned int i = 0;
     for (i=0; i < mhAccounts.count();++i)
     {
         mhAccounts[i]->refresh(false);
         sFolders = mhAccounts[i]->subFolders();
         sels->addAccounts(mhAccounts[i]->getWrapper(),sFolders);
     }
     for (i=0; i < imapAccounts.count();++i)
     {
         if (imapAccounts[i]->offline())
             continue;
         imapAccounts[i]->refreshFolders(false);
         sels->addAccounts(imapAccounts[i]->getWrapper(),imapAccounts[i]->subFolders());
     }
 }
 void AccountView::downloadMailsInbox(const FolderP&fromFolder,AbstractMail*fromWrapper)
 {
 #if 0
     AbstractMail*targetMail = 0;
     QString targetFolder = "";
     Selectstore sels;
     setupFolderselect(&sels);
     if (!sels.exec()) return;
     targetMail = sels.currentMail();
     targetFolder = sels.currentFolder();
     if ( (fromWrapper==targetMail && fromFolder->getName()==targetFolder) ||
             targetFolder.isEmpty())
     {
         return;
     }
     if (sels.newFolder() && !targetMail->createMbox(targetFolder))
     {
         QMessageBox::critical(0,i18n("Error creating new Folder"),
                               i18n("<center>Error while creating<br>new folder - breaking.</center>"));
         return;
     }
     int maxsize = 0;
     if ( sels.useSize->isChecked()) 
         maxsize = sels.sizeSpinBox->value();
     fromWrapper->mvcpAllMails(fromFolder,targetFolder,targetMail,sels.moveMails(),  maxsize);
 #endif   
     fromWrapper->downloadNewMails( fromFolder, mhAccounts[0]->getWrapper());   
     refreshCurrent();
 
 }
 
 void AccountView::downloadMails(const FolderP&fromFolder,AbstractMail*fromWrapper)
 {
     AbstractMail*targetMail = 0;
     QString targetFolder = "";
     Selectstore sels;
     setupFolderselect(&sels);
     if (!sels.exec()) return;
     targetMail = sels.currentMail();
     targetFolder = sels.currentFolder();
     if ( (fromWrapper==targetMail && fromFolder->getName()==targetFolder) ||
             targetFolder.isEmpty())
     {
         return;
     }
     if (sels.newFolder() && !targetMail->createMbox(targetFolder))
     {
         QMessageBox::critical(0,i18n("Error creating new Folder"),
                               i18n("<center>Error while creating<br>new folder - breaking.</center>"));
         return;
     }
     int maxsize = 0;
     if ( sels.useSize->isChecked()) 
         maxsize = sels.sizeSpinBox->value();
         
     fromWrapper->mvcpAllMails(fromFolder,targetFolder,targetMail,sels.moveMails(),  maxsize);
     refreshCurrent();
 }
 
 bool AccountView::currentisDraft()
 {
     AccountViewItem *view = static_cast<AccountViewItem *>(currentItem());
     if (!view) return false;
     return view->isDraftfolder();
 }
diff --git a/microkde/kdeui/kmainwindow.cpp b/microkde/kdeui/kmainwindow.cpp
index 3ae4c87..fa678f2 100644
--- a/microkde/kdeui/kmainwindow.cpp
+++ b/microkde/kdeui/kmainwindow.cpp
@@ -1,440 +1,440 @@
  /* This file is part of the KDE libraries
      Copyright
      (C) 2000 Reginald Stadlbauer (reggie@kde.org)
      (C) 1997 Stephan Kulow (coolo@kde.org)
      (C) 1997-2000 Sven Radej (radej@kde.org)
      (C) 1997-2000 Matthias Ettrich (ettrich@kde.org)
      (C) 1999 Chris Schlaeger (cs@kde.org)
      (C) 2002 Joseph Wenninger (jowenn@kde.org)
 
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License version 2 as published by the Free Software Foundation.
 
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
 
      You should have received a copy of the GNU Library General Public License
      along with this library; see the file COPYING.LIB.  If not, write to
      the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
      Boston, MA 02111-1307, USA.
  */
 #include <qobjectlist.h>
 #include <qstringlist.h>
 #include <qtimer.h>
 #include <qmenubar.h>
 #include <qstatusbar.h>
 #include <qapplication.h>
 
  
 #include "kdebug.h"
 #include "kmainwindow.h"
 #include "kglobalsettings.h"
 #include "kactioncollection.h"
 
 class KMainWindowPrivate {
 public:
 //US    bool showHelpMenu:1;
 
     bool autoSaveSettings:1;
     bool settingsDirty:1;
     bool autoSaveWindowSize:1;
     bool care_about_geometry:1;
     QString autoSaveGroup;
 //US    KAccel * kaccel;
 //US    KMainWindowInterface *m_interface;
     KDEPrivate::ToolBarHandler *toolBarHandler;
     QTimer* settingsTimer;
     KToggleAction *showStatusBarAction;
     QRect defaultWindowSize;
 };
 
 static bool no_query_exit = false;
 
-KMainWindow::KMainWindow( QWidget* parent, const char *name, WFlags f )
+KMainWindow::KMainWindow( QWidget* parent, const char *name )
     : QMainWindow( parent, name ) /*LR, f ) with the default widget flag we cannot have fastload */ /*US, KXMLGUIBuilder( this ), helpMenu2( 0 ), factory_( 0 )*/
 {
     mQToolBar = 0;
     initKMainWindow(name);
 }
 
 void KMainWindow::parseGeometry(bool parsewidth)
 {
 //US the following code is not getting used in the embedded version !! So disable it for now   
 /*US    
     
     assert ( !kapp->geometryArgument().isNull() );
     assert ( d->care_about_geometry );
 
 #ifndef Q_WS_QWS
     // FIXME: (E) Implement something similar for Qt Embedded (or decide we don't need it)
     int x, y;
     int w, h;
     int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
     if (parsewidth) {
         QSize minSize = minimumSize();
         QSize maxSize = maximumSize();
         if ( (m & WidthValue) == 0 )
             w = width();
         if ( (m & HeightValue) == 0 )
             h = height();
          w = QMIN(w,maxSize.width());
          h = QMIN(h,maxSize.height());
          w = QMAX(w,minSize.width());
          h = QMAX(h,minSize.height());
          resize(w, h);
     } else {
         if ( parsewidth && (m & XValue) == 0 )
             x = geometry().x();
         if ( parsewidth && (m & YValue) == 0 )
             y = geometry().y();
         if ( (m & XNegative) )
             x = KApplication::desktop()->width()  + x - w;
         if ( (m & YNegative) )
             y = KApplication::desktop()->height() + y - h;
         move(x, y);
     }
 #endif
 */    
 }
 
 KMainWindow::~KMainWindow()
 {
     delete d->settingsTimer;
     QMenuBar* mb = internalMenuBar();
     delete mb;
 //US    delete d->m_interface;
     
     delete d;
 //US    memberList->remove( this );
 }
 
 void KMainWindow::initKMainWindow(const char *name)
 {
     setDockMenuEnabled( FALSE );
 //US     mHelpMenu = 0;
     
 //US    kapp->setTopWidget( this );
     actionCollection()->setWidget( this );
 //US    connect(kapp, SIGNAL(shutDown()), this, SLOT(shuttingDown()));
 //US    if( !memberList )
 //US        memberList = new QPtrList<KMainWindow>;
 /*US    
 
     if ( !ksm )
         ksm = ksmd.setObject(new KMWSessionManaged());
     // set a unique object name. Required by session management.
     QCString objname;
     QCString s;
     int unusedNumber;
     if ( !name )
         { // no name given
         objname = kapp->instanceName() + "-mainwindow#";
         s = objname + '1'; // start adding number immediately
         unusedNumber = 1;
         }
     else if( name[ strlen( name ) - 1 ] == '#' )
         { // trailing # - always add a number
         objname = name;
         s = objname + '1'; // start adding number immediately
         unusedNumber = 1;
         }
     else
         {
         objname = name;
         s = objname;
         unusedNumber = 0; // add numbers only when needed
         }
     for(;;) {
         QWidgetList* list = kapp->topLevelWidgets();
         QWidgetListIt it( *list );
         bool found = false;
         for( QWidget* w = it.current();
              w != NULL;
              ++it, w = it.current())
             if( w != this && w->name() == s )
                 {
                 found = true;
                 break;
                 }
         delete list;
         if( !found )
             break;
         s.setNum( ++unusedNumber );
         s = objname + s;
     }
     setName( s );
     memberList->append( this );
 */
     
     d = new KMainWindowPrivate;
 //US    d->showHelpMenu = true;
     d->settingsDirty = false;
     d->autoSaveSettings = false;
     d->autoSaveWindowSize = true; // for compatibility
 //US    d->kaccel = actionCollection()->kaccel();
     d->toolBarHandler = 0;
     d->settingsTimer = 0;
     d->showStatusBarAction = NULL;
 /*US    
     if ((d->care_about_geometry == beeing_first)) {
         beeing_first = false;
         if ( kapp->geometryArgument().isNull() ) // if there is no geometry, it doesn't mater
             d->care_about_geometry = false;
         else
             parseGeometry(false);
     }
 */    
     d->care_about_geometry = false;
 
 //US    setCaption( kapp->caption() );
     // attach dcop interface
 //US    d->m_interface = new KMainWindowInterface(this);
 
 //US    if (!kapp->authorize("movable_toolbars"))
 //US        setDockWindowsMovable(false);
 }
 
 KAction *KMainWindow::toolBarMenuAction()
 {
   if ( !d->toolBarHandler )
     return 0;
 
   return d->toolBarHandler->toolBarMenuAction();
 }
 
 bool KMainWindow::canBeRestored( int number )
 {
 /*US we do not have and want to save sessioninformation. Use info from the default 
 application config.
 */
 //US    if ( !kapp->isRestored() )
 //US        return FALSE;
 //US    KConfig *config = kapp->sessionConfig();
     KConfig *config = KGlobal::config();
     if ( !config )
         return FALSE;
     config->setGroup( QString::fromLatin1("Number") );
     int n = config->readNumEntry( QString::fromLatin1("NumberOfWindows") , 1 );
     return number >= 1 && number <= n;
 
 }
 
 const QString KMainWindow::classNameOfToplevel( int number )
 {
 /*US we do not have and want to save sessioninformation. Use info from the default 
 application config.
 */
 //US    if ( !kapp->isRestored() )
 //US        return QString::null;
 //US    KConfig *config = kapp->sessionConfig();
     KConfig *config = KGlobal::config();
     if ( !config )
         return QString::null;
     QString s;
     s.setNum( number );
     s.prepend( QString::fromLatin1("WindowProperties") );
     config->setGroup( s );
     if ( !config->hasKey( QString::fromLatin1("ClassName") ) )
         return QString::null;
     else
         return config->readEntry( QString::fromLatin1("ClassName") );
 }
 
 bool KMainWindow::restore( int number, bool show )
 {
 /*US we do not have and want to save sessioninformation. Use info from the default 
 application config.
 */
     if ( !canBeRestored( number ) )
         return FALSE;
 //US    KConfig *config = kapp->sessionConfig();
     KConfig *config = KGlobal::config();
 
     if ( readPropertiesInternal( config, number ) ){
         if ( show )
             KMainWindow::show();
         return FALSE;
     }
     return FALSE;
     
 }
 
 void KMainWindow::setCaption( const QString &caption )
 {
 //US    setPlainCaption( kapp->makeStdCaption(caption) );
     setPlainCaption( caption );
 }
 
 void KMainWindow::setCaption( const QString &caption, bool modified )
 {
 //US    setPlainCaption( kapp->makeStdCaption(caption, true, modified) );
     setPlainCaption( caption + "modified:" );
 }
 
 void KMainWindow::setPlainCaption( const QString &caption )
 {
     QMainWindow::setCaption( caption );
 #ifndef Q_WS_QWS
 //US the following is disabled for the embedded version
 //US    NETWinInfo info( qt_xdisplay(), winId(), qt_xrootwin(), 0 );
 //US    info.setName( caption.utf8().data() );
 #endif
 }
 
 void KMainWindow::slotStateChanged(const QString &newstate)
 {
   stateChanged(newstate, KXMLGUIClient::StateNoReverse);
 }
 
 /*
  * Get rid of this for KDE 4.0
  */
 void KMainWindow::slotStateChanged(const QString &newstate,
                                    KXMLGUIClient::ReverseStateChange reverse)
 {
   stateChanged(newstate, reverse);
 }
 
 void KMainWindow::closeEvent ( QCloseEvent *e )
 {
     //qDebug("MainWindow::closeEvent  ");
     // Save settings if auto-save is enabled, and settings have changed
     if (d->settingsDirty && d->autoSaveSettings)
         saveAutoSaveSettings();
 
     if (queryClose()) {
         e->accept();
 
         int not_withdrawn = 0;
 /*US        
         QPtrListIterator<KMainWindow> it(*KMainWindow::memberList);
         for (it.toFirst(); it.current(); ++it){
             if ( !it.current()->isHidden() && it.current()->isTopLevel() && it.current() != this )
                 not_withdrawn++;
         }
 */
         if ( !no_query_exit && not_withdrawn <= 0 ) { // last window close accepted?
 /*US            
             if ( queryExit() && !kapp->sessionSaving()) {            // Yes, Quit app?
                 // don't call queryExit() twice
                 disconnect(kapp, SIGNAL(shutDown()), this, SLOT(shuttingDown()));
                 kapp->deref();             // ...and quit aplication.
             }  else {
                 // cancel closing, it's stupid to end up with no windows at all....
                 e->ignore();
             }
 */
 //US we have no sessionmanagement. Simply close app.
             if ( queryExit() ) {            // Yes, Quit app?
             qDebug("KMainWindow::closeEvent: Exit application ???");
                 // don't call queryExit() twice
 //US                disconnect(kapp, SIGNAL(shutDown()), this, SLOT(shuttingDown()));
             } 
             
         }
     }
 }
 
 bool KMainWindow::queryExit()
 {
     return TRUE;
 }
 
 bool KMainWindow::queryClose()
 {
     return TRUE;
 }
 
 void KMainWindow::saveGlobalProperties( KConfig*  )
 {
 }
 
 void KMainWindow::readGlobalProperties( KConfig*  )
 {
 }
 
 void KMainWindow::savePropertiesInternal( KConfig *config, int number )
 {
     bool oldASWS = d->autoSaveWindowSize;
     d->autoSaveWindowSize = true; // make saveMainWindowSettings save the window size
 
     QString s;
     s.setNum(number);
     s.prepend(QString::fromLatin1("WindowProperties"));
     config->setGroup(s);
 
     // store objectName, className, Width and Height  for later restoring
     // (Only useful for session management)
     config->writeEntry(QString::fromLatin1("ObjectName"), name());
     config->writeEntry(QString::fromLatin1("ClassName"), className());
 
     saveMainWindowSettings(config); // Menubar, statusbar and Toolbar settings.
 
     s.setNum(number);
     config->setGroup(s);
     saveProperties(config);
 
     d->autoSaveWindowSize = oldASWS;
 }
 
 void KMainWindow::setStandardToolBarMenuEnabled( bool enable )
 {
   if ( enable )
   {
     if ( d->toolBarHandler )
       return;
 
   d->toolBarHandler = new KDEPrivate::ToolBarHandler( this );
 
 /*US  if ( factory() )
     factory()->addClient( d->toolBarHandler );
 */    
   }
   else
   {
     if ( !d->toolBarHandler )
       return;
 /*US
     if ( factory() )
       factory()->removeClient( d->toolBarHandler );
 */
     delete d->toolBarHandler;
     d->toolBarHandler = 0;
   }
   
 }
 
 bool KMainWindow::isStandardToolBarMenuEnabled() const
 {
     return ( d->toolBarHandler != 0 );
 }
 
 void KMainWindow::createStandardStatusBarAction(){
   if(!d->showStatusBarAction){
     d->showStatusBarAction = KStdAction::showStatusbar(this, SLOT(setSettingsDirty()), actionCollection());
     connect(d->showStatusBarAction, SIGNAL(toggled(bool)), statusBar(), SLOT(setShown(bool)));
     if(internalStatusBar())
       d->showStatusBarAction->setChecked(!internalStatusBar()->isHidden());
   }
 }
 
 QToolBar *KMainWindow::tBar(  )
 {
     if  ( ! mQToolBar )
       mQToolBar =   new QToolBar( this );
     return mQToolBar;
 }
 
 KToolBar *KMainWindow::toolBar( const char * name )
 {
    
     if (!name)
        name = "mainToolBar";
     KToolBar *tb = (KToolBar*)child( name, "KToolBar" );
     if ( tb )
         return tb;
     bool honor_mode = (name == "mainToolBar");
 
@@ -466,530 +466,531 @@ void KMainWindow::setAutoSaveSettings( const QString & groupName, bool saveWindo
     d->autoSaveSettings = true;
     d->autoSaveGroup = groupName;
     d->autoSaveWindowSize = saveWindowSize;
     // Get notified when the user moves a toolbar around
 //US    connect( this, SIGNAL( dockWindowPositionChanged( QDockWindow * ) ),
 //US             this, SLOT( setSettingsDirty() ) );
     connect( this, SIGNAL( toolBarPositionChanged(QToolBar *) ),
              this, SLOT( setSettingsDirty() ) );
 
              
     // Get default values
 //US    int scnum = QApplication::desktop()->screenNumber(parentWidget());
 //US    QRect desk = QApplication::desktop()->screenGeometry(scnum);
     QRect desk = KGlobalSettings::desktopGeometry(0);
     
     d->defaultWindowSize = QRect(desk.width(), width(), desk.height(), height());
     // Now read the previously saved settings
     applyMainWindowSettings( KGlobal::config(), groupName );
 }
 
 
 void KMainWindow::resetAutoSaveSettings()
 {
     d->autoSaveSettings = false;
     if ( d->settingsTimer )
         d->settingsTimer->stop();
 }
 
 bool KMainWindow::autoSaveSettings() const
 {
     return d->autoSaveSettings;
 }
 
 QString KMainWindow::autoSaveGroup() const
 {
     return d->autoSaveGroup;
 }
 
 void KMainWindow::saveAutoSaveSettings()
 {
     ASSERT( d->autoSaveSettings );
     //kdDebug(200) << "KMainWindow::saveAutoSaveSettings -> saving settings" << endl;
     saveMainWindowSettings( KGlobal::config(), d->autoSaveGroup );
     KGlobal::config()->sync();
     d->settingsDirty = false;
     if ( d->settingsTimer )
         d->settingsTimer->stop();
 }
 
 void KMainWindow::createGUI( const QString &xmlfile, bool _conserveMemory )
 {
     // disabling the updates prevents unnecessary redraws
     setUpdatesEnabled( false );
 
     // just in case we are rebuilding, let's remove our old client
 //US    guiFactory()->removeClient( this );
 
     // make sure to have an empty GUI
     QMenuBar* mb = internalMenuBar();
     if ( mb )
         mb->clear();
 
     (void)toolBarIterator(); // make sure toolbarList is most-up-to-date
     toolbarList.setAutoDelete( true );
     toolbarList.clear();
     toolbarList.setAutoDelete( false );
 /*US
     // don't build a help menu unless the user ask for it
     if (d->showHelpMenu) {
         // we always want a help menu
         if (helpMenu2 == 0)
             helpMenu2 = new KHelpMenu(this, instance()->aboutData(), true,
                                       actionCollection());
     }
 
     // we always want to load in our global standards file
     setXMLFile( locate( "config", "ui/ui_standards.rc", instance() ) );
 
     // now, merge in our local xml file.  if this is null, then that
     // means that we will be only using the global file
     if ( !xmlfile.isNull() ) {
         setXMLFile( xmlfile, true );
     } else {
         QString auto_file(instance()->instanceName() + "ui.rc");
         setXMLFile( auto_file, true );
     }
 
     // make sure we don't have any state saved already
     setXMLGUIBuildDocument( QDomDocument() );
 
     // do the actual GUI building
     guiFactory()->addClient( this );
 
     // try and get back *some* of our memory
     if ( _conserveMemory )
     {
       // before freeing the memory allocated by the DOM document we also
       // free all memory allocated internally in the KXMLGUIFactory for
       // the menubar and the toolbars . This however implies that we
       // have to take care of deleting those widgets ourselves. For
       // destruction this is no problem, but when rebuilding we have
       // to take care of that (and we want to rebuild the GUI when
       // using stuff like the toolbar editor ).
       // In addition we have to take care of not removing containers
       // like popupmenus, defined in the XML document.
       // this code should probably go into a separate method in KMainWindow.
       // there's just one problem: I'm bad in finding names ;-) , so
       // I skipped this ;-)
 
       QDomDocument doc = domDocument();
 
       QDomElement e = doc.documentElement().firstChild().toElement();
       for (; !e.isNull(); e = e.nextSibling().toElement() ) {
           if ( e.tagName().lower() == "toolbar" )
               factory_->resetContainer( e.attribute( "name" ) );
           else if ( e.tagName().lower() == "menubar" )
               factory_->resetContainer( e.tagName(), true );
       }
 
       conserveMemory();
     }
 */
     setUpdatesEnabled( true );
     updateGeometry();
 }
 
 void KMainWindow::saveMainWindowSettings(KConfig *config, const QString &configGroup)
 {
     kdDebug(200) << "KMainWindow::saveMainWindowSettings " << configGroup << endl;
 //US    QStrList entryList;
     QStringList entryList;
     QString oldGroup;
 
     if (!configGroup.isEmpty())
     {
        oldGroup = config->group();
        config->setGroup(configGroup);
     }
 
     // Called by session management - or if we want to save the window size anyway
     if ( d->autoSaveWindowSize )
         saveWindowSize( config );
 
     QStatusBar* sb = internalStatusBar();
     if (sb) {
         entryList.clear();
         if ( sb->isHidden() )
             entryList.append("Disabled");
         else
             entryList.append("Enabled");
 
 	if(sb->isHidden())
 //US	  config->writeEntry(QString::fromLatin1("StatusBar"), entryList, ';');
 	  config->writeEntry(QString::fromLatin1("StatusBar"), entryList);
 	else
 	  config->deleteEntry(QString::fromLatin1("StatusBar"));
     }
 
     QMenuBar* mb = internalMenuBar();
     if (mb) {
         entryList.clear();
         if ( mb->isHidden() )
             entryList.append("Disabled");
         else
             entryList.append("Enabled");
 
 	// By default we don't hide.
 	if(mb->isHidden())
 //US	  config->writeEntry(QString::fromLatin1("MenuBar"), entryList, ';');
 	  config->writeEntry(QString::fromLatin1("MenuBar"), entryList);
 	else
 	  config->deleteEntry(QString::fromLatin1("MenuBar"));
     }
 
     int n = 1; // Toolbar counter. toolbars are counted from 1,
     KToolBar *toolbar = 0;
     QPtrListIterator<KToolBar> it( toolBarIterator() );
     while ( ( toolbar = it.current() ) ) {
         ++it;
         QString group;
         if (!configGroup.isEmpty())
         {
            // Give a number to the toolbar, but prefer a name if there is one,
            // because there's no real guarantee on the ordering of toolbars
            group = (!::qstrcmp(toolbar->name(), "unnamed") ? QString::number(n) : QString(" ")+toolbar->name());
            group.prepend(" Toolbar");
            group.prepend(configGroup);
         }
         toolbar->saveSettings(config, group);
         n++;
     }
     if (!configGroup.isEmpty())
        config->setGroup(oldGroup);
 }
 
 bool KMainWindow::readPropertiesInternal( KConfig *config, int number )
 {
     if ( number == 1 )
         readGlobalProperties( config );
 
     // in order they are in toolbar list
     QString s;
     s.setNum(number);
     s.prepend(QString::fromLatin1("WindowProperties"));
 
     config->setGroup(s);
 
     // restore the object name (window role)
     if ( config->hasKey(QString::fromLatin1("ObjectName" )) )
         setName( config->readEntry(QString::fromLatin1("ObjectName")).latin1()); // latin1 is right here
 
     applyMainWindowSettings(config); // Menubar, statusbar and toolbar settings.
 
     s.setNum(number);
     config->setGroup(s);
     readProperties(config);
     return true;
 }
 
 void KMainWindow::applyMainWindowSettings(KConfig *config, const QString &configGroup)
 {
     kdDebug(200) << "KMainWindow::applyMainWindowSettings" << endl;
     QString entry;
 //US    QStrList entryList;
     QStringList entryList;
     int i = 0; // Number of entries in list
 
     if (!configGroup.isEmpty())
        config->setGroup(configGroup);
 
     restoreWindowSize(config);
 
     QStatusBar* sb = internalStatusBar();
     if (sb) {
         entryList.clear();
 //US        i = config->readListEntry (QString::fromLatin1("StatusBar"), entryList, ';');
         entryList = config->readListEntry (QString::fromLatin1("StatusBar"));
         entry = entryList.first();
         if (entry == QString::fromLatin1("Disabled"))
            sb->hide();
         else
            sb->show();
 	if(d->showStatusBarAction)
 	   d->showStatusBarAction->setChecked(!sb->isHidden());
     }
 
     QMenuBar* mb = internalMenuBar();
     if (mb) {
         entryList.clear();
 //US        i = config->readListEntry (QString::fromLatin1("MenuBar"), entryList, ';');
         entryList = config->readListEntry (QString::fromLatin1("MenuBar"));
         entry = entryList.first();
         if (entry==QString::fromLatin1("Disabled"))
         {
             mb->hide(); 
         } else
         {
             mb->show();
         }
     }
 
         int n = 1; // Toolbar counter. toolbars are counted from 1,
         KToolBar *toolbar;
         QPtrListIterator<KToolBar> it( toolBarIterator() ); // must use own iterator
 
         for ( ; it.current(); ++it) {
             toolbar= it.current();
             QString group;
             if (!configGroup.isEmpty())
             {
                // Give a number to the toolbar, but prefer a name if there is one,
                // because there's no real guarantee on the ordering of toolbars
                group = (!::qstrcmp(toolbar->name(), "unnamed") ? QString::number(n) : QString(" ")+toolbar->name());
                group.prepend(" Toolbar");
                group.prepend(configGroup);
             }
             toolbar->applySettings(config, group);
             n++;
         }
 
     finalizeGUI( true );
     }
 
 void KMainWindow::finalizeGUI( bool force )
 {
     //kdDebug(200) << "KMainWindow::finalizeGUI force=" << force << endl;
     // The whole reason for this is that moveToolBar relies on the indexes
     // of the other toolbars, so in theory it should be called only once per
     // toolbar, but in increasing order of indexes.
     // Since we can't do that immediately, we move them, and _then_
     // we call positionYourself again for each of them, but this time
     // the toolbariterator should give them in the proper order.
     // Both the XMLGUI and applySettings call this, hence "force" for the latter.
     QPtrListIterator<KToolBar> it( toolBarIterator() );
     for ( ; it.current() ; ++ it )
             it.current()->positionYourself( force );
 
     d->settingsDirty = false;
 }
 
 void KMainWindow::saveWindowSize( KConfig * config ) const
 {
 /*US  
   int scnum = QApplication::desktop()->screenNumber(parentWidget());
   QRect desk = QApplication::desktop()->screenGeometry(scnum);
 */
   QRect desk = KGlobalSettings::desktopGeometry(0);
   
   QRect size( desk.width(), width(), desk.height(), height() );
   if(size != d->defaultWindowSize){
     config->writeEntry(QString::fromLatin1("Width %1").arg(desk.width()), width() );
     config->writeEntry(QString::fromLatin1("Height %1").arg(desk.height()), height() );
   }
   else{
     config->deleteEntry(QString::fromLatin1("Width %1").arg(desk.width()));
     config->deleteEntry(QString::fromLatin1("Height %1").arg(desk.height()));
   }
 }
 
 void KMainWindow::restoreWindowSize( KConfig * config )
 {
     if (d->care_about_geometry) {
         parseGeometry(true);
     } else {
         // restore the size
 /*US        int scnum = QApplication::desktop()->screenNumber(parentWidget());
         QRect desk = QApplication::desktop()->screenGeometry(scnum);
 */        
         QRect desk = KGlobalSettings::desktopGeometry(0);
         
         QSize size( config->readNumEntry( QString::fromLatin1("Width %1").arg(desk.width()), 0 ),
                     config->readNumEntry( QString::fromLatin1("Height %1").arg(desk.height()), 0 ) );
         if (size.isEmpty()) {
             // try the KDE 2.0 way
             size = QSize( config->readNumEntry( QString::fromLatin1("Width"), 0 ),
                           config->readNumEntry( QString::fromLatin1("Height"), 0 ) );
             if (!size.isEmpty()) {
                 // make sure the other resolutions don't get old settings
                 config->writeEntry( QString::fromLatin1("Width"), 0 );
                 config->writeEntry( QString::fromLatin1("Height"), 0 );
             }
         }
         if ( !size.isEmpty() )
             resize( size );
     }
 }
 
 bool KMainWindow::initialGeometrySet() const
 {
     return d->care_about_geometry;
 }
 
 void KMainWindow::ignoreInitialGeometry()
 {
     d->care_about_geometry = false;
 }
 
 void KMainWindow::setSettingsDirty()
 {
     //kdDebug(200) << "KMainWindow::setSettingsDirty" << endl;
     d->settingsDirty = true;
     if ( d->autoSaveSettings )
     {
         // Use a timer to save "immediately" user-wise, but not too immediately
         // (to compress calls and save only once, in case of multiple changes)
         if ( !d->settingsTimer )
         {
            d->settingsTimer = new QTimer( this );
            connect( d->settingsTimer, SIGNAL( timeout() ), SLOT( saveAutoSaveSettings() ) );
         }
         d->settingsTimer->start( 500, true );
     }
 }
 
 bool KMainWindow::settingsDirty() const
 {
     return d->settingsDirty;
 }
 
 QString KMainWindow::settingsGroup() const
 {
     return d->autoSaveGroup;
 }
 
-void KMainWindow::resizeEvent( QResizeEvent * )
+void KMainWindow::resizeEvent( QResizeEvent * e)
 {
     if ( d->autoSaveWindowSize )
-        setSettingsDirty();
+        setSettingsDirty(); 
+    QMainWindow::resizeEvent( e ); 
 }
 
 bool KMainWindow::hasMenuBar()
 {
 	return (internalMenuBar());
 }
 
 //US KMenuBar *KMainWindow::menuBar()
 QMenuBar *KMainWindow::menuBar()
 {
 //US    KMenuBar * mb = internalMenuBar();
     QMenuBar * mb = internalMenuBar();
     if ( !mb ) {
 //US        mb = new KMenuBar( this );
         mb = new QMenuBar( this );
         // trigger a re-layout and trigger a call to the private
         // setMenuBar method.
         QMainWindow::menuBar();
     }
     return mb;
 }
 
 //US KStatusBar *KMainWindow::statusBar()
 QStatusBar *KMainWindow::statusBar()
 {
 //US    KStatusBar * sb = internalStatusBar();
     QStatusBar * sb = internalStatusBar();
     if ( !sb ) {
 //US        sb = new KStatusBar( this );
         sb = new QStatusBar( this );
         // trigger a re-layout and trigger a call to the private
         // setStatusBar method.
         QMainWindow::statusBar();
     }
     return sb;
 }
 
 void KMainWindow::shuttingDown()
 {
     // Needed for Qt <= 3.0.3 at least to prevent reentrancy
     // when queryExit() shows a dialog. Check before removing!
     static bool reentrancy_protection = false;
     if (!reentrancy_protection)
     {
        reentrancy_protection = true;
        // call the virtual queryExit
        queryExit();
        reentrancy_protection = false;
     }
 
 }
 
 //US KMenuBar *KMainWindow::internalMenuBar()
 QMenuBar *KMainWindow::internalMenuBar()
 {
 //US    QObjectList *l = queryList( "KMenuBar", 0, false, false );
     QObjectList *l = queryList( "QMenuBar", 0, false, false );
     if ( !l || !l->first() ) {
         delete l;
         return 0;
     }
 
 //US    KMenuBar *m = (KMenuBar*)l->first();
     QMenuBar *m = (QMenuBar*)l->first();
     delete l;
     return m;
 }
 
 //US KStatusBar *KMainWindow::internalStatusBar()
 QStatusBar *KMainWindow::internalStatusBar()
 {
 //US    QObjectList *l = queryList( "KStatusBar", 0, false, false );
     QObjectList *l = queryList( "QStatusBar", 0, false, false );
     if ( !l || !l->first() ) {
         delete l;
         return 0;
     }
 
 //US    KStatusBar *s = (KStatusBar*)l->first();
     QStatusBar *s = (QStatusBar*)l->first();
     delete l;
     return s;
 }
 
 void KMainWindow::childEvent( QChildEvent* e)
 {
     QMainWindow::childEvent( e );
 }
 
-void KMainWindow::paintEvent( QPaintEvent * )
+void KMainWindow::paintEvent( QPaintEvent * e)
 {
-    // do nothing
+    QMainWindow::paintEvent( e );
 }
 
 QSize KMainWindow::sizeForCentralWidgetSize(QSize size)
 {
     KToolBar *tb = (KToolBar*)child( "mainToolBar", "KToolBar" );
     if (tb && !tb->isHidden()) {
         switch( tb->barPos() )
         {
           case KToolBar::Top:
           case KToolBar::Bottom:
             size += QSize(0, tb->sizeHint().height());
             break;
 
           case KToolBar::Left:
           case KToolBar::Right:
             size += QSize(toolBar()->sizeHint().width(), 0);
             break;
 
           case KToolBar::Flat:
 //US            size += QSize(0, 3+kapp->style().pixelMetric( QStyle::PM_DockWindowHandleExtent ));
             size += QSize(0, tb->sizeHint().height());
             break;
 
           default:
             break;
         }
     }
 //US    KMenuBar *mb = menuBar();
     QMenuBar *mb = menuBar();
     if (!mb->isHidden()) {
         size += QSize(0,mb->heightForWidth(size.width()));
 /*US        if (style().styleHint(QStyle::SH_MainWindow_SpaceBelowMenuBar, this))
            size += QSize( 0, dockWindowsMovable() ? 1 : 2);
 */           
            size += QSize( 0, 2);
     }
     QStatusBar *sb = internalStatusBar();
     if( sb && !sb->isHidden() )
        size += QSize(0, sb->sizeHint().height());
 
     return size;
 }
 
 // why do we support old gcc versions? using KXMLGUIBuilder::finalizeGUI;
 void KMainWindow::finalizeGUI( KXMLGUIClient *client )
 { /*US KXMLGUIBuilder::finalizeGUI( client );*/ }
 
 void KMainWindow::virtual_hook( int id, void* data )
 { /*US KXMLGUIBuilder::virtual_hook( id, data );*/
   KXMLGUIClient::virtual_hook( id, data ); }
diff --git a/microkde/kdeui/kmainwindow.h b/microkde/kdeui/kmainwindow.h
index 2aafb9d..2dc8033 100644
--- a/microkde/kdeui/kmainwindow.h
+++ b/microkde/kdeui/kmainwindow.h
@@ -1,481 +1,481 @@
 /*
     This file is part of the KDE libraries
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License version 2 as published by the Free Software Foundation.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 
     $Id$
 
 */
 
 
 
 #ifndef KMAINWINDOW_H
 #define KMAINWINDOW_H
 
 /*US
 #include "kxmlguifactory.h"
 #include "kxmlguiclient.h"
 #include "kxmlguibuilder.h"
 #include <qmetaobject.h>
 
 class KPopupMenu;
 class KXMLGUIFactory;
 class KConfig;
 class KHelpMenu;
 class KStatusBar;
 class QStatusBar;
 class KMenuBar;
 class KMWSessionManaged;
 class KAccel;
 class KToolBarMenuAction;
 */
 
 class QMenuBar;
 class QStatusBar;
 class KMainWindowPrivate;
 class KAction;
 
 #include <ktoolbar.h>
 #include <ktoolbarhandler.h>
 #include <kxmlguiclient.h>
 #include <qmainwindow.h>
 #include <qptrlist.h>
 
 class KActionCollection;
 
 class KMainWindow : public QMainWindow, virtual public KXMLGUIClient
 {
   Q_OBJECT
 
 private:
 //US create private defaultconstructor
     KMainWindow() {;};
   
 
 public:
     /**
      * Construct a main window.
      *
      * @param parent The widget parent. This is usually 0 but it may also be the window
      * group leader. In that case, the KMainWindow becomes sort of a
      * secondary window.
      *
      * @param name The object name. For session management and window management to work
      * properly, all main windows in the application should have a
      * different name. When passing 0 (the default), KMainWindow will create
      * a unique name, but it's recommended to explicitly pass a window name that will
      * also describe the type of the window. If there can be several windows of the same
      * type, append '#' (hash) to the name, and KMainWindow will append numbers to make
      * the names unique. For example, for a mail client which has one main window showing
      * the mails and folders, and which can also have one or more windows for composing
      * mails, the name for the folders window should be e.g. "mainwindow" and
      * for the composer windows "composer#".
      *
      * @param f Specify the widget flags. The default is
      * WType_TopLevel and WDestructiveClose.  TopLevel indicates that a
      * main window is a toplevel window, regardless of whether it has a
      * parent or not. DestructiveClose indicates that a main window is
      * automatically destroyed when its window is closed. Pass 0 if
      * you do not want this behavior.
      *
      * KMainWindows must be created on the heap with 'new', like:
      *  <pre> KMainWindow *kmw = new KMainWindow (...</pre>
      **/
     //LR remove  WDestructiveClose
-    KMainWindow( QWidget* parent = 0, const char *name = 0, WFlags f = WType_TopLevel /*| WDestructiveClose*/ );
+    KMainWindow( QWidget* parent = 0, const char *name = 0 ); //, WFlags f = WType_TopLevel /*| WDestructiveClose*/ ;
 
 
     /**
      * Destructor.
      *
      * Will also destroy the toolbars, and menubar if
      * needed.
      */
     virtual ~KMainWindow();
 
     /**
      * Retrieve the standard help menu.
      *
      * It contains entires for the
      * help system (activated by F1), an optional "What's This?" entry
      * (activated by Shift F1), an application specific dialog box,
      * and an "About KDE" dialog box.
      *
      * Example (adding a standard help menu to your application):
      * <pre>
      * KPopupMenu *help = helpMenu( <myTextString> );
      * menuBar()->insertItem( i18n("&Help"), help );
      * </pre>
      *
      * @param aboutAppText The string that is used in the application
      *        specific dialog box. If you leave this string empty the
      *        information in the global @ref KAboutData of the
      *        application will be used to make a standard dialog box.
      *
      * @param showWhatsThis Set this to false if you do not want to include
      *        the "What's This" menu entry.
      *
      * @return A standard help menu.
      */
 //US    KPopupMenu* helpMenu( const QString &aboutAppText = QString::null,
 //US    bool showWhatsThis = TRUE );
 
     /**
      * Returns the help menu. Creates a standard help menu if none exists yet.
      *
      * It contains entries for the
      * help system (activated by F1), an optional "What's This?" entry
      * (activated by Shift F1), an application specific dialog box,
      * and an "About KDE" dialog box. You must create the application
      * specific dialog box yourself. When the "About application"
      * menu entry is activated, a signal will trigger the
      * @ref showAboutApplication slot. See @ref showAboutApplication for more
      * information.
      *
      * Example (adding a help menu to your application):
      * <pre>
      * menuBar()->insertItem( i18n("&Help"), customHelpMenu() );
      * </pre>
      *
      * @param showWhatsThis Set this to @p false if you do not want to include
      *        the "What's This" menu entry.
      *
      * @return A standard help menu.
      */
 //US    KPopupMenu* customHelpMenu( bool showWhatsThis = TRUE );
 
     /**
      * @sect Session Management
      *
      * Try to restore the toplevel widget as defined by the number (1..X).
      *
      * If the session did not contain so high a number, the configuration
      * is not changed and @p false returned.
      *
      * That means clients could simply do the following:
      * <pre>
      * if (kapp->isRestored()){
      *   int n = 1;
      *   while (KMainWindow::canBeRestored(n)){
      *     (new childMW)->restore(n);
      *     n++;
      *   }
      * } else {
      * // create default application as usual
      * }
      * </pre>
      * Note that @ref QWidget::show() is called implicitly in restore.
      *
      * With this you can easily restore all toplevel windows of your
      * application.
      *
      * If your application uses different kinds of toplevel
      * windows, then you can use @ref KMainWindow::classNameOfToplevel(n)
      * to determine the exact type before calling the childMW
      * constructor in the example from above.
      *
      * If your client has only one kind of toplevel widgets (which
      * should be pretty usual) then you should use the RESTORE-macro
      * for backwards compatibility with 3.1 and 3.0 branches:
      *
      * <pre>
      * if (kapp->isRestored())
      *   RESTORE(childMW)
      * else {
      * // create default application as usual
      * }
      * </pre>
      *
      * The macro expands to the term above but is easier to use and
      * less code to write.
      *
      * For new code or if you have more than one kind of toplevel
      * widget (each derived from @ref KMainWindow, of course), you can
      * use the templated @ref kRestoreMainWindows global functions:
      *
      * <pre>
      * if (kapp->isRestored())
      *   kRestoreMainWindows< childMW1, childMW2, childMW3 >();
      * else {
      * // create default application as usual
      * }
      * </pre>
      *
      * Currently, these functions are provided for up to three
      * template arguments. If you need more, tell us. To help you in
      * deciding whether or not you can use @ref kRestoreMainWindows, a
      * define KDE_RESTORE_MAIN_WINDOWS_NUM_TEMPLATE_ARGS is provided.
      *
      * @see restore()
      * @see classNameOfToplevel()
      *
      **/
     static bool canBeRestored( int number );
 
     /**
      * Returns the @ref className() of the @p number of the toplevel window which
      * should be restored.
      *
      *  This is only useful if your application uses
      * different kinds of toplevel windows.
      */
     static const QString classNameOfToplevel( int number );
 
     /**
      * Restore the session specified by @p number.
      *
      * Returns @p false if this
      * fails, otherwise returns @p true and shows the window.
      * You should call @ref canBeRestored() first.
      * If @p show is true (default), this widget will be shown automatically.
      */
     bool restore( int number, bool show = TRUE );
 
 //US    virtual KXMLGUIFactory *guiFactory();
 
     /**
      * Create a GUI given a local XML file.
      *
      * If @p xmlfile is NULL,
      * then it will try to construct a local XML filename like
      * appnameui.rc where 'appname' is your app's name.  If that file
      * does not exist, then the XML UI code will only use the global
      * (standard) XML file for the layout purposes.
      *
      * Note that when passing true for the conserveMemory argument subsequent
      * calls to guiFactory()->addClient/removeClient may not work as expected.
      * Also retrieving references to containers like popup menus or toolbars using
      * the container method will not work.
      *
      * @param xmlfile The local xmlfile (relative or absolute)
      * @param _conserveMemory Specify whether createGUI() should call
      *     @ref KXMLGuiClient::conserveMemory() to free all memory
      *     allocated by the @ref QDomDocument and by the KXMLGUIFactory.
      */
     void createGUI( const QString &xmlfile = QString::null, bool _conserveMemory = TRUE );
 
     /**
      * Enables the build of a standard help menu when calling createGUI().
      *
      * The default behavior is to build one, you must call this function
      * to disable it
      */
     void setHelpMenuEnabled(bool showHelpMenu = true);
 
     /**
      * Return @p true when the help menu is enabled
      */
     bool isHelpMenuEnabled();
 
 
     /**
      * Returns true, if there is a menubar
      * @since 3.1
      */
      bool hasMenuBar();
 
     /**
      * Returns a pointer to the menu bar.
      *
      * If there is no menu bar yet one will be created.
      **/
 //US    KMenuBar *menuBar();
     QMenuBar *menuBar();
 
     /**
      * Returns a pointer to the status bar.
      *
      *  If there is no
      * status bar yet one will be created.
      */
 //US    KStatusBar *statusBar();
     QStatusBar *statusBar();
 
     /**
      * List of members of KMainWindow class.
      */
 //US    static QPtrList<KMainWindow>* memberList;
 
     /**
      * Returns a pointer to the toolbar with the specified name.
      * This refers to toolbars created dynamically from the XML UI
      * framework.  If the toolbar does not exist one will be created.
      *
      * @param name The internal name of the toolbar. If no name is
      *             specified "mainToolBar" is assumed.
      *
      * @return A pointer to the toolbar
      **/
     KToolBar *toolBar( const char *name=0 );
     // method for getting rid of KDE-Crap
     QToolBar *tBar( );
 
     /**
      * @return An iterator over the list of all toolbars for this window.
      */
     QPtrListIterator<KToolBar> toolBarIterator();
 
     /**
      * @return A KAccel instance bound to this mainwindow. Used automatically
      * by KAction to make keybindings work in all cases.
      */
     KAccel *accel();
 
     void setFrameBorderWidth( int ) {}
 
     /**
      * Call this to enable "auto-save" of toolbar/menubar/statusbar settings
      * (and optionally window size).
      * If the *bars were moved around/shown/hidden when the window is closed,
      * saveMainWindowSettings( KGlobal::config(), groupName ) will be called.
      *
      * @param groupName a name that identifies this "type of window".
      * You can have several types of window in the same application.
      *
      * @param saveWindowSize set it to true to include the window size
      * when saving.
      *
      * Typically, you will call setAutoSaveSettings() in your
      * KMainWindow-inherited class constructor, and it will take care
      * of restoring and saving automatically. Make sure you call this
      * _after all_ your *bars have been created.
      */
     void setAutoSaveSettings( const QString & groupName = QString::fromLatin1("MainWindow"),
                               bool saveWindowSize = true );
 
     /**
      * Disable the auto-save-settings feature.
      * You don't normally need to call this, ever.
      */
     void resetAutoSaveSettings();
 
     /**
      * @return the current autosave setting, i.e. true if setAutoSaveSettings() was called,
      * false by default or if resetAutoSaveSettings() was called.
      * @since 3.1
      */
     bool autoSaveSettings() const;
 
     /**
      * @return the group used for setting-autosaving.
      * Only meaningful if setAutoSaveSettings() was called.
      * This can be useful for forcing a save or an apply, e.g. before and after
      * using KEditToolbar.
      * @since 3.1
      */
     QString autoSaveGroup() const;
 
     /**
      * Read settings for statusbar, menubar and toolbar from their respective
      * groups in the config file and apply them.
      *
      * @param config Config file to read the settings from.
      * @param groupName Group name to use. If not specified, the last used
      * group name is used.
      */
     void applyMainWindowSettings(KConfig *config, const QString &groupName = QString::null);
 
     /**
      * Save settings for statusbar, menubar and toolbar to their respective
      * groups in the config file @p config.
      *
      * @param config Config file to save the settings to.
      * @param groupName Group name to use. If not specified, the last used
      * group name is used
      */
     void saveMainWindowSettings(KConfig *config, const QString &groupName = QString::null);
 
     /**
      * Sets whether KMainWindow should provide a menu that allows showing/hiding
      * the available toolbars ( using @ref KToggleToolBarAction ) . In case there
      * is only one toolbar configured a simple 'Show <toolbar name here>' menu item
      * is shown.
      *
      * The menu / menu item is implemented using xmlgui. It will be inserted in your
      * menu structure in the 'Settings' menu.
      *
      * If your application uses a non-standard xmlgui resource file then you can
      * specify the exact position of the menu / menu item by adding a
      * &lt;Merge name="StandardToolBarMenuHandler" /&gt;
      * line to the settings menu section of your resource file ( usually appname.rc ).
      *
      * Note that you should enable this feature before calling createGUI() ( or similar ) .
      * You enable/disable it anytime if you pass false to the conserveMemory argument of createGUI.
      * @since 3.1
      */
     void setStandardToolBarMenuEnabled( bool enable );
     /// @since 3.1
     bool isStandardToolBarMenuEnabled() const;
 
 
     /**
      * Sets whether KMainWindow should provide a menu that allows showing/hiding
      * of the statusbar ( using @ref KToggleStatusBarAction ).
      *
      * The menu / menu item is implemented using xmlgui. It will be inserted
      * in your menu structure in the 'Settings' menu.
      *
      * Note that you should enable this feature before calling createGUI()
      * ( or similar ).
      *
      * If an application maintains the action on its own (i.e. never calls
      * this function) a connection needs to be made to let KMainWindow
      * know when that status (hidden/shown) of the statusbar has changed.
      * For example:
      * connect(action, SIGNAL(activated()),
      *         kmainwindow, SLOT(setSettingsDirty()));
      * Otherwise the status (hidden/show) of the statusbar might not be saved
      * by KMainWindow.
      * @since 3.2
      */
     void createStandardStatusBarAction();
 
 
     /**
      * Returns a pointer to the mainwindows action responsible for the toolbars menu
      * @since 3.1
      */
     KAction *toolBarMenuAction();
 
     // why do we support old gcc versions? using KXMLGUIBuilder::finalizeGUI;
     /// @since 3.1
     virtual void finalizeGUI( KXMLGUIClient *client );
 
     /**
      * @internal
      */
     void finalizeGUI( bool force );
 
     /**
      * @return true if a -geometry argument was given on the command line,
      * and this is the first window created (the one on which this option applies)
      */
     bool initialGeometrySet() const;
 
     /**
      * @internal
      * Used from Konqueror when reusing the main window.
      */
     void ignoreInitialGeometry();
 
     /**
      * @return the size the mainwindow should have so that the central
      * widget will be of @p size.
      */
     QSize sizeForCentralWidgetSize(QSize size);
 
 public slots:
     /**
      * Makes a KDE compliant caption.