1 files changed, 35 insertions, 7 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 3e578bc..70ab6b7 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -117,25 +117,25 @@ KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, con
     mReadWrite( readWrite ), mModified( false ), mMainWindow(client)
 #else //KAB_EMBEDDED
 KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const char *name )
   : QWidget( parent, name ), mGUIClient( client ), mViewManager( 0 ),
     mExtensionManager( 0 ), mConfigureDialog( 0 ), mLdapSearchDialog( 0 ),
     mReadWrite( readWrite ), mModified( false )
 #endif //KAB_EMBEDDED
 {
 #ifdef KAB_EMBEDDED
   //US we define here our own global actioncollection. 
   //mActionCollection = new KActionCollection(this);
 #endif //KAB_EMBEDDED  
-
+  mExtensionBarSplitter = 0;
   mIsPart = !parent->inherits( "KAddressBookMain" );
 
   mAddressBook = KABC::StdAddressBook::self();
   KABC::StdAddressBook::setAutomaticSave( true );
 
 #ifndef KAB_EMBEDDED
   mAddressBook->setErrorHandler( new KABC::GUIErrorHandler );
 #endif //KAB_EMBEDDED
   
   connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook * ) ),
            SLOT( addressBookChanged() ) );
 
@@ -214,30 +214,39 @@ KABCore::~KABCore()
 
 void KABCore::restoreSettings()
 {
   bool state = KABPrefs::instance()->mJumpButtonBarVisible;
 
   mActionJumpBar->setChecked( state );
   setJumpButtonBarVisible( state );
   
   state = KABPrefs::instance()->mDetailsPageVisible;
 
   mActionDetails->setChecked( state );
   setDetailsVisible( state );
- QValueList<int> splitterSize = KABPrefs::instance()->mExtensionsSplitter;
+ 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 );
+
+  }
 #ifndef KAB_EMBEDDED
   QValueList<int> splitterSize = KABPrefs::instance()->mExtensionsSplitter;
   if ( splitterSize.count() == 0 ) {
     splitterSize.append( width() / 2 );
     splitterSize.append( width() / 2 );
   }
   mExtensionBarSplitter->setSizes( splitterSize );
 
   splitterSize = KABPrefs::instance()->mDetailsSplitter;
   if ( splitterSize.count() == 0 ) {
     splitterSize.append( height() / 2 );
     splitterSize.append( height() / 2 );
@@ -248,27 +257,28 @@ void KABCore::restoreSettings()
 
 #endif //KAB_EMBEDDED
 
   mIncSearchWidget->setCurrentItem( KABPrefs::instance()->mCurrentIncSearchField );
 
   mViewManager->restoreSettings();
   mExtensionManager->restoreSettings();
 }
 
 void KABCore::saveSettings()
 {
   KABPrefs::instance()->mJumpButtonBarVisible = mActionJumpBar->isChecked();
-  KABPrefs::instance()->mExtensionsSplitter = mMiniSplitter->sizes();
+  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();
   
 }
 
@@ -1134,43 +1144,57 @@ void KABCore::initGUI()
 
 //US since we have no splitter for the embedded system, setup
 // a layout with two frames. One left and one right.
 
   QBoxLayout *topLayout;
 
   // = new QHBoxLayout( this );
 //  QBoxLayout *topLayout = (QBoxLayout*)layout();
  
 //  QWidget *mainBox = new QWidget( this );
 //  QBoxLayout * mainBoxLayout  = new QHBoxLayout(mainBox);
 
+#ifdef DESKTOP_VERSION
+  topLayout = new QHBoxLayout( this );
+
  
+  mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
+  mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
+  
+  topLayout->addWidget(mMiniSplitter );
+
+  mExtensionBarSplitter = new KDGanttMinimizeSplitter( Qt::Vertical,mMiniSplitter );
+  mExtensionBarSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
+  mViewManager = new ViewManager( this, mExtensionBarSplitter  );
+  mDetails = new ViewContainer( mMiniSplitter );
+  mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter );
+#else
   if ( QApplication::desktop()->width() > 480 ) {
       topLayout = new QHBoxLayout( this );
       mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
       mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
   } else {
 
       topLayout = new QVBoxLayout( this );
       mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Vertical, this);
       mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
   }
   
   topLayout->addWidget(mMiniSplitter );
   mViewManager = new ViewManager( this,  mMiniSplitter );
   mDetails = new ViewContainer( mMiniSplitter );
   
  
    mExtensionManager = new ExtensionManager( this, mMiniSplitter );
-  
+#endif
    //eh->hide();
   // topLayout->addWidget(mExtensionManager );
  
   
 /*US
 #ifndef KAB_NOSPLITTER
   QHBoxLayout *topLayout = new QHBoxLayout( this );
 //US  topLayout->setSpacing( KDialogBase::spacingHint() );
   topLayout->setSpacing( 10 );
 
   mDetailsSplitter = new QSplitter( this );
 
@@ -1477,33 +1501,37 @@ void KABCore::addActionsManually()
   
   settingsMenu->insertSeparator();
   
   mActionJumpBar->plug( settingsMenu );
   mActionDetails->plug( settingsMenu );
   settingsMenu->insertSeparator();
 
   mActionWhoAmI->plug( settingsMenu );
   mActionCategories->plug( settingsMenu );
   
   mActionAboutKAddressbook->plug( helpMenu );
 
+  
   if (QApplication::desktop()->width() > 320 ) {
 
       mActionEditAddressee->plug( tb );
       mActionSave->plug( tb );
       mViewManager->getFilterAction()->plug ( tb); 
-      if (QApplication::desktop()->width() > 480 ) 
+      if (QApplication::desktop()->width() > 480 ) {
+        mActionUndo->plug( tb );
           mActionDelete->plug( tb );
+        mActionRedo->plug( tb );
+      }
   }
-  mActionQuit->plug ( tb );
+  //mActionQuit->plug ( tb );
   // tb->insertWidget(-1, 0, mIncSearchWidget, 6);
   
   //US link the searchwidget first to this.
   // The real linkage to the toolbar happens later.
 //US  mIncSearchWidget->reparent(tb, 0, QPoint(50,0), TRUE);
 //US  tb->insertItem( mIncSearchWidget );
 /*US  
   mIncSearchWidget = new IncSearchWidget( tb );
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
     
   mJumpButtonBar = new JumpButtonBar( this, this );