Now we can add contact without start kaddressbook

wilder-work
Montel Laurent 14 years ago
parent 6c2341f2f8
commit 16f27da968
  1. 4
      kmail_part.rc
  2. 4
      kmcomposerui.rc
  3. 12
      kmcomposewin.cpp
  4. 1
      kmcomposewin.h
  5. 17
      kmmainwidget.cpp
  6. 1
      kmmainwidget.h
  7. 4
      kmmainwin.rc

@ -2,7 +2,7 @@
the same menu entries at the same place in KMail and Kontact -->
<!DOCTYPE kpartgui>
<kpartgui version="480" name="kmmainwin" >
<kpartgui version="481" name="kmmainwin" >
<MenuBar>
<Menu noMerge="1" name="file" >
<text>&amp;File</text>
@ -14,6 +14,8 @@
<Action name="akonadi_collection_create" />
<Separator/>
<Action name="new_mail_client" />
<Separator/>
<Action name="kmail_new_addressbook_contact" />
</Menu>
<Separator/>
<Action name="file_open" />

@ -1,11 +1,13 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd" >
<kpartgui version="420" name="kmcomposer" >
<kpartgui version="422" name="kmcomposer" >
<MenuBar>
<Menu noMerge="1" name="file" >
<text>&amp;Message</text>
<Action name="new_composer" />
<Action name="open_mailreader" />
<Separator/>
<Action name="kmail_new_addressbook_contact" />
<Separator/>
<Action name="send_default" />
<Action name="send_default_via" />
<Action name="send_alternative" />

@ -99,6 +99,7 @@
#include <akonadi/itemcreatejob.h>
#include <akonadi/entitymimetypefiltermodel.h>
#include <akonadi/itemfetchjob.h>
#include <Akonadi/Contact/ContactEditorDialog>
#include <kpimutils/email.h>
#include <kpimidentities/identitymanager.h>
#include <kpimidentities/identitycombo.h>
@ -1154,6 +1155,11 @@ void KMComposeWin::setupActions( void )
actionCollection()->addAction( "save_as_file", action );
connect( action, SIGNAL(triggered(bool)), SLOT(slotSaveAsFile()) );
action = new KAction(i18n("New AddressBook Contact..."),this);
actionCollection()->addAction("kmail_new_addressbook_contact", action );
connect(action, SIGNAL(triggered(bool)), this, SLOT(slotCreateAddressBookContact()));
action = new KAction(KIcon("document-open"), i18n("&Insert Text File..."), this);
actionCollection()->addAction("insert_file", action );
@ -3343,3 +3349,9 @@ void KMComposeWin::slotSaveAsFile()
}
delete dlg;
}
void KMComposeWin::slotCreateAddressBookContact()
{
Akonadi::ContactEditorDialog *dlg = new Akonadi::ContactEditorDialog( Akonadi::ContactEditorDialog::CreateMode, this );
dlg->exec();
}

@ -434,6 +434,7 @@ class KMComposeWin : public KMail::Composer
void insertSpecialCharacter();
void charSelected(const QChar& c);
void slotSaveAsFile();
void slotCreateAddressBookContact();
public: // kmcommand
// FIXME we need to remove these, but they're pure virtual in Composer.

@ -121,6 +121,9 @@
#include <akonadi/collectiondeletejob.h>
#include <akonadi/dbusconnectionpool.h>
#include <Akonadi/CachePolicy>
#include <Akonadi/Contact/ContactEditorDialog>
#include <kpimidentities/identity.h>
#include <kpimidentities/identitymanager.h>
#include <kpimutils/email.h>
@ -3708,6 +3711,14 @@ void KMMainWidget::setupActions()
connect(action, SIGNAL(triggered(bool)), this, SLOT(slotExportData()));
}
{
KAction *action = new KAction(i18n("New AddressBook Contact..."),this);
actionCollection()->addAction("kmail_new_addressbook_contact", action );
connect(action, SIGNAL(triggered(bool)), this, SLOT(slotCreateAddressBookContact()));
}
actionCollection()->addAction(KStandardAction::Undo, "kmail_undo", this, SLOT(slotUndo()));
KStandardAction::tipOfDay( this, SLOT(slotShowTip()), actionCollection() );
@ -4684,3 +4695,9 @@ void KMMainWidget::slotExportData()
"Please check your installation." ),
i18n( "Unable to start backupmail" ) );
}
void KMMainWidget::slotCreateAddressBookContact()
{
Akonadi::ContactEditorDialog *dlg = new Akonadi::ContactEditorDialog( Akonadi::ContactEditorDialog::CreateMode, this );
dlg->exec();
}

@ -460,6 +460,7 @@ class KMAIL_EXPORT KMMainWidget : public QWidget
void slotShowNotification();
void slotConfigureAutomaticArchiving();
void slotExportData();
void slotCreateAddressBookContact();
private:
void updateHtmlMenuEntry();

@ -2,7 +2,7 @@
the same menu entries at the same place in KMail and Kontact -->
<!DOCTYPE kpartgui>
<kpartgui version="480" name="kmmainwin" >
<kpartgui version="481" name="kmmainwin" >
<MenuBar>
<Menu noMerge="1" name="file" >
<text>&amp;File</text>
@ -14,6 +14,8 @@
<Action name="akonadi_collection_create" />
<Separator/>
<Action name="new_mail_client" />
<Separator/>
<Action name="kmail_new_addressbook_contact" />
</Menu>
<Separator/>
<Action name="file_open" />

Loading…
Cancel
Save