Removed strange handling of addresseeeditor

4 files changed, 35 insertions, 48 deletions

diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp
index 102138e..790f148 100644
--- a/kaddressbook/addresseeeditordialog.cpp
+++ b/kaddressbook/addresseeeditordialog.cpp
@@ -21,8 +21,9 @@
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 #include <qlayout.h>
+#include <qapplication.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
@@ -35,15 +36,11 @@
 AddresseeEditorDialog::AddresseeEditorDialog( KABCore *core, QWidget *parent,
                                               const char *name )
   : KDialogBase( KDialogBase::Plain, i18n( "Edit Contact" ), 
                  KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Apply,
-                 KDialogBase::Ok, parent, name, false )
+                 KDialogBase::Ok, parent, name, true )
 {
-#ifdef KAB_EMBEDDED  
-  resize( KMIN(KGlobal::getDesktopWidth()-10, 490), KMIN(KGlobal::getDesktopHeight()-50, 300));
-#endif //KAB_EMBEDDED  
 
-  kdDebug(5720) << "AddresseeEditorDialog()" << endl;
 
   QWidget *page = plainPage();
   
   QVBoxLayout *layout = new QVBoxLayout( page );
@@ -53,15 +50,17 @@ AddresseeEditorDialog::AddresseeEditorDialog( KABCore *core, QWidget *parent,
            SLOT( widgetModified() ) );
   layout->addWidget( mEditorWidget );
   
   enableButton( KDialogBase::Apply, false );
+  if ( QApplication::desktop()->width()  < 480 ) {
+      hideButtons();
+  }
 }
 
 AddresseeEditorDialog::~AddresseeEditorDialog()
 {
-  kdDebug(5720) << "~AddresseeEditorDialog()" << endl;
-
-  emit editorDestroyed( mEditorWidget->addressee().uid() );
+    qDebug("----------------------------------------------- ");
+    //emit editorDestroyed( mEditorWidget->addressee().uid() );
 }
 
 void AddresseeEditorDialog::setAddressee( const KABC::Addressee &addr )
 {
@@ -91,20 +90,19 @@ void AddresseeEditorDialog::slotApply()
   
   KDialogBase::slotApply();
 }
 
+void AddresseeEditorDialog:: accept () 
+{
+    slotOk();
+
+}
 void AddresseeEditorDialog::slotOk()
 {
   slotApply();
   
   KDialogBase::slotOk();
   
-  // Destroy this dialog
-#ifndef KAB_EMBEDDED    
-  delayedDestruct();
-#else //KAB_EMBEDDED    
-  delete this;
-#endif //KAB_EMBEDDED    
 }
 
 void AddresseeEditorDialog::widgetModified()
 {
@@ -114,15 +112,9 @@ void AddresseeEditorDialog::widgetModified()
 void AddresseeEditorDialog::slotCancel()
 {
   KDialogBase::slotCancel();
   
-  // Destroy this dialog
-#ifndef KAB_EMBEDDED    
-  delayedDestruct();
-#else //KAB_EMBEDDED    
-  delete this;
-#endif //KAB_EMBEDDED    
-  
+ 
 }
 
 #ifndef KAB_EMBEDDED    
 #include "addresseeeditordialog.moc"
diff --git a/kaddressbook/addresseeeditordialog.h b/kaddressbook/addresseeeditordialog.h
index 1a00d3a..a1521e2 100644
--- a/kaddressbook/addresseeeditordialog.h
+++ b/kaddressbook/addresseeeditordialog.h
@@ -52,8 +52,9 @@ class AddresseeEditorDialog : public KDialogBase
   protected slots:
     virtual void slotApply();
     virtual void slotOk();
     virtual void slotCancel();
+    virtual void accept () ;
     void widgetModified();
   
   private:
     AddresseeEditorWidget *mEditorWidget;
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 8d08713..b06e1bc 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -62,8 +62,9 @@
 #include "ldapsearchdialog.h"
 #include "printing/printingwizard.h"
 #else // KAB_EMBEDDED
 
+#include <kapplication.h>
 #include "KDGanttMinimizeSplitter.h"
 #include "kaddressbookmain.h"
 #include "kactioncollection.h"
 #include <qapp.h>
@@ -197,9 +198,10 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
 
   mAddressBookService = new KAddressBookService( this );
 
 #endif //KAB_EMBEDDED
-
+  mEditorDialog = 0;
+  createAddresseeEditorDialog( this );
   setModified( false );
 }
 
 KABCore::~KABCore()
@@ -789,15 +791,15 @@ void KABCore::newContact()
 
   if ( resource ) {
     KABC::Addressee addr;
     addr.setResource( resource );
-    dialog = createAddresseeEditorDialog( this );
-    dialog->setAddressee( addr );
+    mEditorDialog->setAddressee( addr );
+    KApplication::execDialog ( mEditorDialog );
     
   } else
     return;
     
-  mEditorDict.insert( dialog->addressee().uid(), dialog );
+  // mEditorDict.insert( dialog->addressee().uid(), dialog );
 
   dialog->show();
   
 }
@@ -866,19 +868,10 @@ void KABCore::editContact( const QString &uid )
   }
 
   KABC::Addressee addr = mAddressBook->findByUid( localUID );
   if ( !addr.isEmpty() ) {
-    AddresseeEditorDialog *dialog = mEditorDict.find( addr.uid() );
-    if ( !dialog ) {
-      dialog = createAddresseeEditorDialog( this );
-
-      mEditorDict.insert( addr.uid(), dialog );
-
-      dialog->setAddressee( addr );
-    }
-
-    dialog->raise();
-    dialog->show();
+      mEditorDialog->setAddressee( addr );
+      KApplication::execDialog ( mEditorDialog );
   }
 }
 
 void KABCore::save()
@@ -1087,26 +1080,27 @@ void KABCore::addressBookChanged()
 
 AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( QWidget *parent,
                                                              const char *name )
 {
-  AddresseeEditorDialog *dialog = new AddresseeEditorDialog( this, parent,
+
+    if ( mEditorDialog == 0 ) {
+  mEditorDialog = new AddresseeEditorDialog( this, parent,
                                                  name ? name : "editorDialog" );
 
-//US  
-    dialog->setMaximumSize( 640, 480 );
-    dialog->showMaximized();
-  
-  connect( dialog, SIGNAL( contactModified( const KABC::Addressee& ) ),
+
+  connect( mEditorDialog, SIGNAL( contactModified( const KABC::Addressee& ) ),
            SLOT( contactModified( const KABC::Addressee& ) ) );
-  connect( dialog, SIGNAL( editorDestroyed( const QString& ) ),
-           SLOT( slotEditorDestroyed( const QString& ) ) );
+  //connect( mEditorDialog, SIGNAL( editorDestroyed( const QString& ) ),
+  //       SLOT( slotEditorDestroyed( const QString& ) ) );
+    }
 
-  return dialog;
+  return mEditorDialog;
 }
 
 void KABCore::slotEditorDestroyed( const QString &uid )
 {
-  mEditorDict.remove( uid );
+    qDebug("KABCore::slotEditorDestroyed called. maybe a problem! ");
+    //mEditorDict.remove( uid );
 }
 
 void KABCore::initGUI()
 {
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index b84ec22..c823f1f 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -358,10 +358,10 @@ class KABCore : public QWidget
 
     KCMultiDialog *mConfigureDialog;
     LDAPSearchDialog *mLdapSearchDialog;
 #endif //KAB_EMBEDDED
-    QDict<AddresseeEditorDialog> mEditorDict;
-
+    // QDict<AddresseeEditorDialog> mEditorDict;
+    AddresseeEditorDialog *mEditorDialog;
     bool mReadWrite;
     bool mModified;
     bool mIsPart;