Allow to remove/modify address

834bcde3 · Laurent Montel · 46be6043 · 834bcde3 · 834bcde3 · 834bcde3
Commit 834bcde3 authored Feb 03, 2016 by Laurent Montel 😁
--- a/akonadi-contact/src/editor/addresseditor/addresseslocationviewer.cpp
+++ b/akonadi-contact/src/editor/addresseditor/addresseslocationviewer.cpp
@@ -31,6 +31,7 @@ AddressesLocationViewer::AddressesLocationViewer(QWidget *parent)
      mAddressesLocationGrantleeFormatter(new AddressesLocationGrantleeFormater(this))
 {
    setContextMenuPolicy(Qt::CustomContextMenu);
+    page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
    settings()->setAttribute(QWebSettings::JavascriptEnabled, false);
    settings()->setAttribute(QWebSettings::JavaEnabled, false);
    settings()->setAttribute(QWebSettings::PluginsEnabled, false);
@@ -46,6 +47,7 @@ AddressesLocationViewer::~AddressesLocationViewer()

 void AddressesLocationViewer::slotLinkClicked(const QUrl &url)
 {
+    qDebug()<<" url "<<url;
    if (url.scheme() == QLatin1String("addresslocationaction")) {
        const QString urlPath(url.path());
        if (url.hasQuery()) {

--- a/akonadi-contact/src/editor/addresseditor/addresslocationwidget.cpp
+++ b/akonadi-contact/src/editor/addresseditor/addresslocationwidget.cpp
@@ -32,6 +32,7 @@
 #include <QLabel>
 #include <QCheckBox>
 #include <QPushButton>
+#include <QDebug>

 AddressLocationWidget::AddressLocationWidget(QWidget *parent)
    : QWidget(parent)
@@ -171,6 +172,7 @@ KContacts::Address AddressLocationWidget::address() const

 void AddressLocationWidget::slotModifyAddress(const KContacts::Address &address, int currentIndex)
 {
+    qDebug()<<" void AddressLocationWidget::slotModifyAddress(const KContacts::Address &address, int currentIndex)"<<currentIndex;
    setAddress(address);
    //TODO store currentIndex.
    //TODO

--- a/akonadi-contact/src/editor/addresseditor/html/default/addresseslocation.html
+++ b/akonadi-contact/src/editor/addresseditor/html/default/addresseslocation.html
@@ -6,7 +6,8 @@
 <body>
 {% if addresses %}
 {% for address in addresses %}
-  <div> {{ address.formattedAddress }} </div>
+  <div> {{ address.formattedAddress }}  {{ address.modifyAddressAction|safe}} {{ address.removeAddressAction|safe}} </div>
+  </br>
 {% endfor %}
 {% endif %}