Removed strange handling of addresseeeditor

6 files changed, 47 insertions, 46 deletions

diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp
index 102138e..790f148 100644
--- a/kaddressbook/addresseeeditordialog.cpp
+++ b/kaddressbook/addresseeeditordialog.cpp
@@ -22,6 +22,7 @@
 */                                                                      
 
 #include <qlayout.h>
+#include <qapplication.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -36,13 +37,9 @@ 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();
   
@@ -54,13 +51,15 @@ AddresseeEditorDialog::AddresseeEditorDialog( KABCore *core, QWidget *parent,
   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 )
@@ -92,18 +91,17 @@ 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()
@@ -115,12 +113,6 @@ void AddresseeEditorDialog::slotCancel()
 {
   KDialogBase::slotCancel();
   
-  // Destroy this dialog
-#ifndef KAB_EMBEDDED    
-  delayedDestruct();
-#else //KAB_EMBEDDED    
-  delete this;
-#endif //KAB_EMBEDDED    
   
 }
 
diff --git a/kaddressbook/addresseeeditordialog.h b/kaddressbook/addresseeeditordialog.h
index 1a00d3a..a1521e2 100644
--- a/kaddressbook/addresseeeditordialog.h
+++ b/kaddressbook/addresseeeditordialog.h
@@ -53,6 +53,7 @@ class AddresseeEditorDialog : public KDialogBase
     virtual void slotApply();
     virtual void slotOk();
     virtual void slotCancel();
+    virtual void accept () ;
     void widgetModified();
   
   private:
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 8d08713..b06e1bc 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -63,6 +63,7 @@
 #include "printing/printingwizard.h"
 #else // KAB_EMBEDDED
 
+#include <kapplication.h>
 #include "KDGanttMinimizeSplitter.h"
 #include "kaddressbookmain.h"
 #include "kactioncollection.h"
@@ -198,7 +199,8 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
   mAddressBookService = new KAddressBookService( this );
 
 #endif //KAB_EMBEDDED
-
+  mEditorDialog = 0;
+  createAddresseeEditorDialog( this );
   setModified( false );
 }
 
@@ -790,13 +792,13 @@ 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();
   
@@ -867,17 +869,8 @@ 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 );
   }
 }
 
@@ -1088,24 +1081,25 @@ 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
@@ -359,8 +359,8 @@ 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;
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp
index 2ea2053..c953058 100644
--- a/microkde/kdialogbase.cpp
+++ b/microkde/kdialogbase.cpp
@@ -77,6 +77,13 @@ void KDialogBase::init( const QString &caption, int buttonMask,
   } else {
     mOkButton = 0;
   }
+  if ( buttonMask & Default ) {
+     qDebug("buttonMask & Default ");
+    mDefaultButton = new QPushButton( i18n("Default"), this );
+    connect( mDefaultButton, SIGNAL( clicked() ), SIGNAL( defaultClicked() ) );
+  } else {
+    mDefaultButton = 0;
+  }
 
   if ( buttonMask & Apply ) {
     mApplyButton = new QPushButton( i18n("Apply"), this );
@@ -115,6 +122,7 @@ void KDialogBase::hideButtons()
     if ( mUser2Button ) mUser2Button->hide() ;
     if ( mOkButton ) mOkButton->hide()  ;
     if ( mApplyButton )  mApplyButton->hide()  ;
+    if ( mDefaultButton ) mDefaultButton->hide();
     if ( mCancelButton ) mCancelButton->hide()  ;
     if ( mCloseButton ) mCloseButton->hide()  ;
   
@@ -136,6 +144,7 @@ void KDialogBase::initLayout()
   if ( mUser2Button ) buttonLayout->addWidget( mUser2Button );
   if ( mOkButton ) buttonLayout->addWidget( mOkButton );
   if ( mApplyButton ) buttonLayout->addWidget( mApplyButton );
+  if ( mDefaultButton ) buttonLayout->addWidget( mDefaultButton );
   if ( mCancelButton ) buttonLayout->addWidget( mCancelButton );
   if ( mCloseButton ) buttonLayout->addWidget( mCloseButton );
 }
@@ -197,6 +206,9 @@ QPushButton *KDialogBase::findButton( ButtonCode id )
     case Cancel:
       button = mCancelButton;
       break;
+    case Default:
+      button = mDefaultButton;
+      break;
     case Close:
       button = mCloseButton;
       break;
diff --git a/microkde/kdialogbase.h b/microkde/kdialogbase.h
index 199d2fa..7b44bfb 100644
--- a/microkde/kdialogbase.h
+++ b/microkde/kdialogbase.h
@@ -105,6 +105,7 @@ class KDialogBase : public KDialog
      * @ref slotClose() is not replaced.
      */
     void closeClicked();
+    void defaultClicked();
 
   protected slots:
     virtual void slotOk();
@@ -134,6 +135,7 @@ class KDialogBase : public KDialog
     QPushButton *mOkButton;
     QPushButton *mApplyButton;
     QPushButton *mCancelButton;    
+    QPushButton *mDefaultButton;    
 };
 
 #endif