print AB

1 files changed, 10 insertions, 11 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 4098dda..e61f65f 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1877,18 +1877,15 @@ void KABCore::initActions()
 #endif //KAB_EMBEDDED
 
   // file menu
-  if ( mIsPart ) {
-    mActionMail = new KAction( i18n( "&Mail" ), "mail_generic", 0, this,
-                               SLOT( sendMail() ), actionCollection(),
-                               "kaddressbook_mail" );
-    mActionPrint = new KAction( i18n( "&Print" ), "fileprint", CTRL + Key_P, this,
-                 SLOT( print() ), actionCollection(), "kaddressbook_print" );
-
-  } else {
+ 
     mActionMail = KStdAction::mail( this, SLOT( sendMail() ), actionCollection() );
-    mActionPrint = KStdAction::print( this, SLOT( print() ), actionCollection() );
-  }
+    //mActionPrint = KStdAction::print( this, SLOT( print() ), actionCollection() );
+    mActionPrint = new KAction( i18n( "&Print View" ), "fileprint", CTRL + Key_P, mViewManager,
+                 SLOT( printView() ), actionCollection(), "kaddressbook_print" );
+  
 
+    mActionPrintDetails = new KAction( i18n( "&Print Details" ), "fileprint", 0, mDetails,
+                 SLOT( printView() ), actionCollection(), "kaddressbook_print2" );
 
   mActionSave = new KAction( i18n( "&Save" ), "filesave", CTRL+Key_S, this,
                              SLOT( save() ), actionCollection(), "file_sync" );
@@ -2139,6 +2136,8 @@ void KABCore::addActionsManually()
   //US Now connect the actions with the menue entries.
 #ifdef DESKTOP_VERSION
   mActionPrint->plug( fileMenu );
+  mActionPrintDetails->plug( fileMenu );
+  fileMenu->insertSeparator();
 #endif
   mActionMail->plug( fileMenu );
   fileMenu->insertSeparator();
@@ -2768,7 +2767,7 @@ int  KABCore::takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, i
         localIsNew = localMod >= remoteMod;
         //qDebug("conflict! ************************************** ");
         {
-            KPIM::AddresseeChooser acd ( *local,*remote, localIsNew , this );
+            KABC::AddresseeChooser acd ( *local,*remote, localIsNew , this );
             result = acd.executeD(localIsNew);
             return result;
         }