added special detailview handling for small devices. Now the behavior is

a little bit similar to qtopia and opie addressbook

2 files changed, 86 insertions, 12 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 6610288..96603e6 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -184,18 +184,28 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
 
   initGUI();
 
   mIncSearchWidget->setFocus();
 
 
   connect( mViewManager, SIGNAL( selected( const QString& ) ),
            SLOT( setContactSelected( const QString& ) ) );
+
+  //small devices show only the details view. bigger devices can edit the entry
+  if (KGlobal::getDesktopSize() > KGlobal::Small ) {
   connect( mViewManager, SIGNAL( executed( const QString& ) ),
            SLOT( editContact( const QString& ) ) );
+  }
+  else
+  {
+    connect( mViewManager, SIGNAL( executed( const QString& ) ),
+           SLOT( showContact( 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( mXXPortManager, SIGNAL( modified() ),
@@ -231,25 +241,32 @@ KABCore::~KABCore()
     //KABPrefs::instance()->writeConfig();
     delete AddresseeConfig::instance();
   mAddressBook = 0;
   KABC::StdAddressBook::close();
 }
 
 void KABCore::restoreSettings()
 {
-  bool state = KABPrefs::instance()->mJumpButtonBarVisible;
-
-  mActionJumpBar->setChecked( state );
-  setJumpButtonBarVisible( state );
+  bool state;
 
+  //small devices have at startup the details view disabled
+  if (KGlobal::getDesktopSize() > KGlobal::Small )
   state = KABPrefs::instance()->mDetailsPageVisible;
+  else
+    state = false;
 
   mActionDetails->setChecked( state );
   setDetailsVisible( state );
+
+  state = KABPrefs::instance()->mJumpButtonBarVisible;
+
+  mActionJumpBar->setChecked( state );
+  setJumpButtonBarVisible( state );
+
  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;
@@ -274,19 +291,18 @@ void KABCore::restoreSettings()
     splitterSize.append( height() / 2 );
   }
   mDetailsSplitter->setSizes( splitterSize );
 
   mExtensionManager->restoreSettings();
 
 #endif //KAB_EMBEDDED
 
-  mIncSearchWidget->setCurrentItem( KABPrefs::instance()->mCurrentIncSearchField );
-
   mViewManager->restoreSettings();
+  mIncSearchWidget->setCurrentItem( KABPrefs::instance()->mCurrentIncSearchField );
   mExtensionManager->restoreSettings();
 }
 
 void KABCore::saveSettings()
 {
   KABPrefs::instance()->mJumpButtonBarVisible = mActionJumpBar->isChecked();
   if ( mExtensionBarSplitter )
     KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes();
@@ -296,17 +312,16 @@ void KABCore::saveSettings()
 
   KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes();
   KABPrefs::instance()->mDetailsSplitter = mDetailsSplitter->sizes();
 #endif //KAB_EMBEDDED
   mExtensionManager->saveSettings();
   mViewManager->saveSettings();
 
   KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem();
-
 }
 
 KABC::AddressBook *KABCore::addressBook() const
 {
   return mAddressBook;
 }
 
 KConfig *KABCore::config()
@@ -410,17 +425,17 @@ void KABCore::createAboutData()
  "(c) 2004 Lutz Rogowski Import from OL rogowski@kde.org\n"
 #endif
  );
 }
 
 void KABCore::setContactSelected( const QString &uid )
 {
   KABC::Addressee addr = mAddressBook->findByUid( uid );
-  if ( !mDetails->isHidden() )
+//US  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:
@@ -1036,16 +1051,27 @@ void KABCore::editContact( const QString &uid )
 
   KABC::Addressee addr = mAddressBook->findByUid( localUID );
   if ( !addr.isEmpty() ) {
       mEditorDialog->setAddressee( addr );
       KApplication::execDialog ( mEditorDialog );
   }
 }
 
+/**
+  Shows the detail view for the given uid. If the uid is QString::null,
+  the method will try to find a selected addressee in the view.
+  We call this method only if we use a small device. Bigger devices are calling editContact instead
+ */
+void KABCore::showContact( const QString &uid /*US = QString::null*/ )
+{
+  setDetailsVisible( true );
+  mActionDetails->setChecked(true);
+}
+
 void KABCore::save()
 {
     if ( !mModified )
         return;
    QString text = i18n( "There was an error while attempting to save\n the "
     "address book. Please check that some \nother application is "
     "not using it. " );
    statusMessage(i18n("Saving addressbook ... "));
@@ -1083,33 +1109,73 @@ void KABCore::redo()
   RedoStack::instance()->redo();
 
   // Refresh the view
   mViewManager->refreshView();
 }
 
 void KABCore::setJumpButtonBarVisible( bool visible )
 {
+  if (KGlobal::getDesktopSize() > KGlobal::Small ) {
+    if ( visible )
+      mJumpButtonBar->show();
+    else
+      mJumpButtonBar->hide();
+  }
+  else
+  {
+	// for the Z5500, show the jumpbar only if "the details are hidden" == "viewmanager are shown"
+    if (mViewManager->isVisible())
+    {
   if ( visible )
     mJumpButtonBar->show();
   else
     mJumpButtonBar->hide();
 }
+	else
+	{
+      mJumpButtonBar->hide();
+	}
+  }
+}
 void KABCore::setDetailsToState()
 {
     setDetailsVisible(  mActionDetails->isChecked() );
 }
 
+
+
 void KABCore::setDetailsVisible( bool visible )
 {
+  //US "details visible" has two different meanings for small devices like the 5500
+  // compared with large devices like the c series.
+
+  // small devices: mDetails is always visible. But we switch between
+  // the listview and the detailview. We do that by changing the splitbar size.
+  if (KGlobal::getDesktopSize() > KGlobal::Small ) {
   if ( visible )
     mDetails->show();
   else
     mDetails->hide();
 }
+  else
+  {
+    if ( visible ) {
+      mViewManager->hide();
+      mDetails->show();
+//      mDetails->show();
+    }
+    else {
+      mViewManager->show();
+      mDetails->hide();
+    }
+    setJumpButtonBarVisible( !visible );
+
+  }
+}
 
 void KABCore::extensionModified( const KABC::Addressee::List &list )
 {
 
   if ( list.count() != 0 ) {
     KABC::Addressee::List::ConstIterator it;
     for ( it = list.begin(); it != list.end(); ++it )
       mAddressBook->insertAddressee( *it );
@@ -1566,17 +1632,17 @@ void KABCore::initActions()
 
     mActionKeyBindings = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() );
   }
 
   mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0,
                                       actionCollection(), "options_show_jump_bar" );
   connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBarVisible( bool ) ) );
 
-  mActionDetails = new KToggleAction( i18n( "Show Details" ), 0, 0,
+  mActionDetails = new KToggleAction( i18n( "Show Details" ), "listview", 0,
                                       actionCollection(), "options_show_details" );
   connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) );
 
   // misc
   // only enable LDAP lookup if we can handle the protocol
 #ifndef KAB_EMBEDDED
   if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) {
     new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0,
@@ -1674,16 +1740,17 @@ void KABCore::addActionsManually()
   mActionPrint->plug( fileMenu );
   mActionMail->plug( fileMenu );
   fileMenu->insertSeparator();
 
   mActionNewContact->plug( fileMenu );
   mActionNewContact->plug( tb );
 
   mActionEditAddressee->plug( fileMenu );
+  mActionEditAddressee->plug( tb );
   fileMenu->insertSeparator();
   mActionSave->plug( fileMenu );
   fileMenu->insertItem( "&Import", ImportMenu );
   fileMenu->insertItem( "&Emport", ExportMenu );
   fileMenu->insertSeparator();
   mActionMailVCard->plug( fileMenu );
 #ifndef DESKTOP_VERSION
   if ( Ir::supported() ) mActionBeamVCard->plug( fileMenu );
@@ -1721,30 +1788,31 @@ void KABCore::addActionsManually()
   } else {
     mActionKeyBindings->plug( settingsMenu );
   }
 
   settingsMenu->insertSeparator();
 
   mActionJumpBar->plug( settingsMenu );
   mActionDetails->plug( settingsMenu );
+  if (KGlobal::getDesktopSize() == KGlobal::Small )
+    mActionDetails->plug( tb );
   settingsMenu->insertSeparator();
 
   mActionWhoAmI->plug( settingsMenu );
   mActionCategories->plug( settingsMenu );
 
   mActionAboutKAddressbook->plug( helpMenu );
   mActionLicence->plug( helpMenu );
 
-  if (QApplication::desktop()->width() > 320 ) {
+  if (KGlobal::getDesktopSize() > KGlobal::Small ) {
 
-      mActionEditAddressee->plug( tb );
       mActionSave->plug( tb );
       mViewManager->getFilterAction()->plug ( tb);
-      if (QApplication::desktop()->width() > 480 ) {
+      if (KGlobal::getDesktopSize() == KGlobal::Desktop ) {
 	mActionUndo->plug( tb );
 	mActionDelete->plug( tb );
 	mActionRedo->plug( tb );
       }
   }
   //mActionQuit->plug ( tb );
   // tb->insertWidget(-1, 0, mIncSearchWidget, 6);
 
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 6bbdfd4..a45c4c6 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -297,16 +297,22 @@ class KABCore : public QWidget
       Shows the edit dialog for the given uid. If the uid is QString::null,
       the method will try to find a selected addressee in the view.
      */
     void editContact( const QString &uid /*US = QString::null*/ );
 //US added a second method without defaultparameter
     void editContact2();
 
     /**
+      Shows the detail view for the given uid. If the uid is QString::null,
+      the method will try to find a selected addressee in the view.
+     */
+    void showContact( const QString &uid /*US = QString::null*/ );
+
+    /**
       Launches the configuration dialog.
      */
     void openConfigDialog();
 
     /**
       Launches the ldap search dialog.
      */
     void openLDAPDialog();