summaryrefslogtreecommitdiffabout
path: root/kaddressbook
authorzautrix <zautrix>2004-07-05 09:24:56 (UTC)
committer zautrix <zautrix>2004-07-05 09:24:56 (UTC)
commit5c5c1354afa5d24768ceefe5b7dd8733ff7bd5f0 (patch) (side-by-side diff)
treef41b695d2b18bf7d7ff84d0d8b39faf15d229669 /kaddressbook
parentc2d4beeaeda44694a3e1c0b72a5808d2f518b286 (diff)
downloadkdepimpi-5c5c1354afa5d24768ceefe5b7dd8733ff7bd5f0.zip
kdepimpi-5c5c1354afa5d24768ceefe5b7dd8733ff7bd5f0.tar.gz
kdepimpi-5c5c1354afa5d24768ceefe5b7dd8733ff7bd5f0.tar.bz2
Removed strange handling of addresseeeditor
Diffstat (limited to 'kaddressbook') (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/addresseeeditordialog.cpp34
-rw-r--r--kaddressbook/addresseeeditordialog.h1
-rw-r--r--kaddressbook/kabcore.cpp44
-rw-r--r--kaddressbook/kabcore.h4
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
@@ -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,13 +113,7 @@ void AddresseeEditorDialog::slotCancel()
{
KDialogBase::slotCancel();
- // Destroy this dialog
-#ifndef KAB_EMBEDDED
- delayedDestruct();
-#else //KAB_EMBEDDED
- delete this;
-#endif //KAB_EMBEDDED
-
+
}
#ifndef 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;