several fixes

13 files changed, 80 insertions, 49 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index b0cb986..4964a6c 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1919,42 +1919,43 @@ void KABCore::addActionsManually()
 
   KToolBar* tb =  mMainWindow->toolBar();
 
-#ifdef DESKTOP_VERSION
-  QMenuBar* mb = mMainWindow->menuBar();
-
-  //US setup menubar.
-  //Disable the following block if you do not want to have a menubar.
-  mb->insertItem( "&File", fileMenu );
-  mb->insertItem( "&Edit", editMenu );
-  mb->insertItem( "&View", viewMenu );
-  mb->insertItem( "&Settings", settingsMenu );
-  mb->insertItem( i18n("Synchronize"), syncMenu );
-  mb->insertItem( "&Change selected", changeMenu );
-  mb->insertItem( "&Help", helpMenu );
-  mIncSearchWidget = new IncSearchWidget( tb );
-  // tb->insertWidget(-1, 0, mIncSearchWidget);
-
-#else
-  //US setup toolbar
-  QPEMenuBar   *menuBarTB = new QPEMenuBar( tb );
-  QPopupMenu *popupBarTB = new QPopupMenu( this );
-  menuBarTB->insertItem( "ME", popupBarTB);
-  tb->insertWidget(-1, 0, menuBarTB);
-  mIncSearchWidget = new IncSearchWidget( tb );
 
-  tb->enableMoving(false);
-  popupBarTB->insertItem( "&File", fileMenu );
-  popupBarTB->insertItem( "&Edit", editMenu );
-  popupBarTB->insertItem( "&View", viewMenu );
-  popupBarTB->insertItem( "&Settings", settingsMenu );
-  popupBarTB->insertItem( i18n("Synchronize"), syncMenu );
-  mViewManager->getFilterAction()->plug ( popupBarTB);
-  popupBarTB->insertItem( "&Change selected", changeMenu );
-  popupBarTB->insertItem( "&Help", helpMenu );
-  if (QApplication::desktop()->width() > 320 ) {
-      // mViewManager->getFilterAction()->plug ( tb);
+  if ( KABPrefs::instance()->mFullMenuBarVisible ) {
+      QMenuBar* mb = mMainWindow->menuBar();
+
+      //US setup menubar.
+      //Disable the following block if you do not want to have a menubar.
+      mb->insertItem( "&File", fileMenu );
+      mb->insertItem( "&Edit", editMenu );
+      mb->insertItem( "&View", viewMenu );
+      mb->insertItem( "&Settings", settingsMenu );
+      mb->insertItem( i18n("Synchronize"), syncMenu );
+      mb->insertItem( "&Change selected", changeMenu );
+      mb->insertItem( "&Help", helpMenu );
+      mIncSearchWidget = new IncSearchWidget( tb );
+      // tb->insertWidget(-1, 0, mIncSearchWidget);
+
+  } else  {
+      //US setup toolbar
+      QPEMenuBar   *menuBarTB = new QPEMenuBar( tb );
+      QPopupMenu *popupBarTB = new QPopupMenu( this );
+      menuBarTB->insertItem( "ME", popupBarTB);
+      tb->insertWidget(-1, 0, menuBarTB);
+      mIncSearchWidget = new IncSearchWidget( tb );
+
+      tb->enableMoving(false);
+      popupBarTB->insertItem( "&File", fileMenu );
+      popupBarTB->insertItem( "&Edit", editMenu );
+      popupBarTB->insertItem( "&View", viewMenu );
+      popupBarTB->insertItem( "&Settings", settingsMenu );
+      popupBarTB->insertItem( i18n("Synchronize"), syncMenu );
+      mViewManager->getFilterAction()->plug ( popupBarTB);
+      popupBarTB->insertItem( "&Change selected", changeMenu );
+      popupBarTB->insertItem( "&Help", helpMenu );
+      if (QApplication::desktop()->width() > 320 ) {
+          // mViewManager->getFilterAction()->plug ( tb);
+      }
   }
-#endif
   // mActionQuit->plug ( mMainWindow->toolBar());
 
 
@@ -1968,8 +1969,8 @@ void KABCore::addActionsManually()
   mActionNewContact->plug( tb );
 
   mActionEditAddressee->plug( fileMenu );
-  if ((KGlobal::getDesktopSize() > KGlobal::Small ) ||
-      (!KABPrefs::instance()->mMultipleViewsAtOnce ))
+  // if ((KGlobal::getDesktopSize() > KGlobal::Small ) ||
+  //  (!KABPrefs::instance()->mMultipleViewsAtOnce ))
     mActionEditAddressee->plug( tb );
 
   fileMenu->insertSeparator();
@@ -2021,8 +2022,8 @@ void KABCore::addActionsManually()
 
   mActionJumpBar->plug( settingsMenu );
   mActionDetails->plug( settingsMenu );
-  if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop  )
-    mActionDetails->plug( tb );
+  //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop  )
+  mActionDetails->plug( tb );
   settingsMenu->insertSeparator();
   mActionBR->plug(settingsMenu );
   settingsMenu->insertSeparator();
@@ -2042,13 +2043,13 @@ void KABCore::addActionsManually()
       mActionSave->plug( tb );
       mViewManager->getFilterAction()->plug ( tb);
       if (KGlobal::getDesktopSize() == KGlobal::Desktop ) {
-	mActionUndo->plug( tb );
-	mActionDelete->plug( tb );
-	mActionRedo->plug( tb );
+          mActionUndo->plug( tb );
+          mActionDelete->plug( tb );
+          mActionRedo->plug( tb );
       }
   } else {
-      if (KABPrefs::instance()->mMultipleViewsAtOnce )
-          mActionSave->plug( tb );
+      mActionSave->plug( tb );
+      tb->enableMoving(false);
   }
   //mActionQuit->plug ( tb );
   // tb->insertWidget(-1, 0, mIncSearchWidget, 6);
diff --git a/kaddressbook/kabprefs.cpp b/kaddressbook/kabprefs.cpp
index 3cbcc9a..db123da 100644
--- a/kaddressbook/kabprefs.cpp
+++ b/kaddressbook/kabprefs.cpp
@@ -67,6 +67,11 @@ KABPrefs::KABPrefs()
 #endif //KAB_EMBEDDED
 
   KPrefs::setCurrentGroup( "MainWindow" );
+  bool m_visible = false;
+#ifdef DESKTOP_VERSION
+  m_visible = true;
+#endif
+  addItemBool( "FullMenuBarVisible", &mFullMenuBarVisible, m_visible );
   addItemBool( "JumpButtonBarVisible", &mJumpButtonBarVisible, false );
   addItemBool( "DetailsPageVisible", &mDetailsPageVisible, true );
   addItemIntList( "ExtensionsSplitter", &mExtensionsSplitter );
diff --git a/kaddressbook/kabprefs.h b/kaddressbook/kabprefs.h
index cc8413e..1e3b48f 100644
--- a/kaddressbook/kabprefs.h
+++ b/kaddressbook/kabprefs.h
@@ -65,6 +65,7 @@ class KABPrefs : public KPimPrefs
 
 
     // GUI
+    bool mFullMenuBarVisible;
     bool mJumpButtonBarVisible;
     bool mDetailsPageVisible;
     bool mMultipleViewsAtOnce;
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index c134e96..2e91cbc 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -67,6 +67,7 @@ class KAddressBookView : public QWidget
     virtual void doSearch( const QString&  s ,KABC::Field *field ) = 0;
     virtual void scrollUP() = 0;
     virtual void scrollDOWN() = 0;
+    virtual void setFocusAV() = 0;
 
     /**
       Called whenever this view should read the config. This can be used
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index 936d052..8bf9bb0 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -119,6 +119,8 @@ KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *
   boxLayout->setAlignment( Qt::AlignTop );
   boxLayout->setMargin(KDialog::marginHintSmall() );
   boxLayout->setSpacing( KDialog::spacingHintSmall() );
+  mMenuBarBox = new QCheckBox( i18n( "Full Menu bar (restart)" ), vBox, "mremenuturn" );
+  boxLayout->addWidget( mMenuBarBox );
   mSearchReturnBox = new QCheckBox( i18n( "Search only after <return> key pressed" ), vBox, "mreturn" );
   boxLayout->addWidget( mSearchReturnBox );
   mViewsSingleClickBox = new QCheckBox( i18n( "Honor KDE single click" ), vBox, "msingle" );
@@ -165,6 +167,7 @@ KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *
 
   extensionLayout->addWidget( groupBox );
 
+  connect( mMenuBarBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mNameParsing, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mViewsSingleClickBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mSearchReturnBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
@@ -192,7 +195,7 @@ void KABConfigWidget::usrReadConfig()
 
   bool blocked = signalsBlocked();
   blockSignals( true );
-
+  mMenuBarBox->setChecked( prefs->mFullMenuBarVisible);
   mNameParsing->setChecked( prefs->mAutomaticNameParsing );
   mViewsSingleClickBox->setChecked( prefs->mHonorSingleClick );
   mSearchReturnBox->setChecked( prefs->mSearchWithReturn );
@@ -210,7 +213,7 @@ void KABConfigWidget::usrReadConfig()
 void KABConfigWidget::usrWriteConfig()
 {
   KABPrefs* prefs = KABPrefs::instance();
-
+  prefs->mFullMenuBarVisible = mMenuBarBox->isChecked();
   prefs->mAutomaticNameParsing = mNameParsing->isChecked();
   prefs->mHonorSingleClick = mViewsSingleClickBox->isChecked();
   prefs->mSearchWithReturn = mSearchReturnBox->isChecked();
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h
index 1e71fd1..08d71b4 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.h
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.h
@@ -66,7 +66,7 @@ class KABConfigWidget : public KPrefsWidget
     QCheckBox *mViewsSingleClickBox;
     QCheckBox *mMultipleViewsAtOnce;
     QCheckBox *mAskForQuit;
-
+    QCheckBox *mMenuBarBox;
     QPushButton *mConfigureButton;
 
     AddresseeWidget *mAddresseeWidget;
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 81e0d99..3d0c275 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -106,7 +106,7 @@ void ViewManager::restoreSettings()
   mFilterList = Filter::restore( mCore->config(), "Filter" );
   mActionSelectFilter->setItems( filterNames() );
   mActionSelectFilter->setCurrentItem( KABPrefs::instance()->mCurrentFilter );
-
+  mActionSelectFilter->setComboWidth( 100 );
   // Tell the views to reread their config, since they may have
   // been modified by global settings
   QString _oldgroup = mCore->config()->group();
@@ -303,7 +303,7 @@ void ViewManager::refreshView( const QString &uid )
 void ViewManager::setFocusAV()
 {
  if ( mActiveView )
-     mActiveView->setFocus();
+     mActiveView->setFocusAV();
 }
 void ViewManager::editView()
 {
@@ -597,6 +597,7 @@ void ViewManager::configureFilters()
   mActionSelectFilter->setItems( filterNames() );
   mActionSelectFilter->setCurrentItem( pos );
   setActiveFilter( pos );
+  //mActionSelectFilter->setComboWidth( 150 );
 }
 
 QStringList ViewManager::filterNames() const
@@ -692,7 +693,6 @@ void ViewManager::initActions()
                "options_edit_filters" );
 
   mActionSelectFilter = new KSelectAction( i18n( "Select Filter" ), "filter", mCore->actionCollection(), "select_filter" );
-
 #if KDE_VERSION >= 309
   mActionSelectFilter->setMenuAccelsEnabled( false );
 #endif
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index a7bf6c9..7f33bb4 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -169,7 +169,12 @@ KAddressBookCardView::KAddressBookCardView( KABC::AddressBook *ab,
 KAddressBookCardView::~KAddressBookCardView()
 {
 }
+void KAddressBookCardView::setFocusAV()
+{
+    if ( mCardView )
+        mCardView->setFocus();
 
+}
 void KAddressBookCardView::scrollUP()
 {
     QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 );
diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h
index 45a9781..8f22d54 100644
--- a/kaddressbook/views/kaddressbookcardview.h
+++ b/kaddressbook/views/kaddressbookcardview.h
@@ -62,6 +62,7 @@ class KAddressBookCardView : public KAddressBookView
     virtual void writeConfig(KConfig *);
     virtual void scrollUP();
     virtual void scrollDOWN();
+    virtual void setFocusAV();
     
   public slots:
     void refresh(QString uid = QString::null);
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index f4c68b8..41c3cb2 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -211,6 +211,12 @@ KAddressBookIconView::KAddressBookIconView( KABC::AddressBook *ab,
 KAddressBookIconView::~KAddressBookIconView()
 {
 }
+void KAddressBookIconView::setFocusAV()
+{
+    if ( mIconView )
+        mIconView->setFocus();
+}
+
 
 void KAddressBookIconView::scrollUP()
 {
diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h
index acfcd71..b0b9fea 100644
--- a/kaddressbook/views/kaddressbookiconview.h
+++ b/kaddressbook/views/kaddressbookiconview.h
@@ -63,6 +63,7 @@ class KAddressBookIconView : public KAddressBookView
     virtual void readConfig(KConfig *config);
     virtual void scrollUP();
     virtual void scrollDOWN();
+    virtual void setFocusAV();
     
   public slots:
     void refresh(QString uid = QString::null);
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 2412170..e40eb9e 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -51,6 +51,12 @@ KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab,
 KAddressBookTableView::~KAddressBookTableView()
 {
 }
+void KAddressBookTableView::setFocusAV()
+{
+    if ( mListView )
+        mListView->setFocus();
+
+}
 void KAddressBookTableView::scrollUP()
 {
     QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 );
diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h
index 865f8d5..38db7b4 100644
--- a/kaddressbook/views/kaddressbooktableview.h
+++ b/kaddressbook/views/kaddressbooktableview.h
@@ -65,6 +65,7 @@ friend class ContactListView;
     void doSearch( const QString&  s ,KABC::Field *field );
     virtual void scrollUP();
     virtual void scrollDOWN();
+    virtual void setFocusAV();
 
   public slots:
     virtual void reconstructListView();