diff --git a/sflphone_kde/ConfigDialog.cpp b/sflphone_kde/ConfigDialog.cpp
index be7b371d62d761ec91a49db1e737af8591665023..21c7efd3a226146d9ca8016faf2b10a66b49772a 100644
--- a/sflphone_kde/ConfigDialog.cpp
+++ b/sflphone_kde/ConfigDialog.cpp
@@ -165,13 +165,29 @@ void ConfigurationDialog::loadOptions()
////Address book settings////
/////////////////////////////
- qDebug() << "getAddressbookSettings() : " << configurationManager.getAddressbookSettings().value();
MapStringInt addressBookSettings = configurationManager.getAddressbookSettings().value();
+ qDebug() << "getAddressbookSettings() : " << addressBookSettings;
spinBox_maxResults->setValue(addressBookSettings[ADDRESSBOOK_MAX_RESULTS]);
checkBox_displayPhoto->setChecked(addressBookSettings[ADDRESSBOOK_DISPLAY_CONTACT_PHOTO]);
checkBox_business->setChecked(addressBookSettings[ADDRESSBOOK_DISPLAY_BUSINESS]);
checkBox_mobile->setChecked(addressBookSettings[ADDRESSBOOK_DISPLAY_MOBILE]);
checkBox_home->setChecked(addressBookSettings[ADDRESSBOOK_DISPLAY_HOME]);
+
+ /////////////////////////////
+ ///////Hooks settings////////
+ /////////////////////////////
+
+ MapStringString hooksSettings = configurationManager.getHookSettings().value();
+ qDebug() << "getHooksSettings() : " << hooksSettings;
+ checkBox_addPrefix->setChecked(hooksSettings[HOOKS_ENABLED]=="1");
+ lineEdit_prepend->setText(hooksSettings[HOOKS_ADD_PREFIX]);
+ checkBox_hooksSIP->setChecked(hooksSettings[HOOKS_SIP_ENABLED]=="1");
+ checkBox_hooksIAX->setChecked(hooksSettings[HOOKS_IAX2_ENABLED]=="1");
+ lineEdit_SIPHeader->setText(hooksSettings[HOOKS_SIP_FIELD]);
+ lineEdit_command->setText(hooksSettings[HOOKS_COMMAND]);
+
+
+
}
@@ -270,6 +286,20 @@ void ConfigurationDialog::saveOptions()
addressBookSettings[ADDRESSBOOK_DISPLAY_MOBILE] = checkBox_mobile->isChecked();
addressBookSettings[ADDRESSBOOK_DISPLAY_HOME] = checkBox_home->isChecked();
configurationManager.setAddressbookSettings(addressBookSettings);
+
+ /////////////////////////////
+ ///////Hooks settings////////
+ /////////////////////////////
+
+ MapStringString hooksSettings = MapStringString();
+ hooksSettings[HOOKS_ENABLED] = checkBox_addPrefix->isChecked() ? "1" : "0";
+ hooksSettings[HOOKS_ADD_PREFIX] = lineEdit_prepend->text();
+ hooksSettings[HOOKS_SIP_ENABLED] = checkBox_hooksSIP->isChecked() ? "1" : "0";
+ hooksSettings[HOOKS_IAX2_ENABLED] = checkBox_hooksIAX->isChecked() ? "1" : "0";
+ hooksSettings[HOOKS_SIP_FIELD] = lineEdit_SIPHeader->text();
+ hooksSettings[HOOKS_COMMAND] = lineEdit_command->text();
+ configurationManager.setHookSettings(hooksSettings);
+
}
diff --git a/sflphone_kde/ConfigDialog.ui b/sflphone_kde/ConfigDialog.ui
index 8d86245aa387bfb27f5fa2b6780c8c0ca9befd40..c5ffbf0c81ddf0f51d44fcd16f684db6320d6217 100644
--- a/sflphone_kde/ConfigDialog.ui
+++ b/sflphone_kde/ConfigDialog.ui
@@ -7,8 +7,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>702</width>
- <height>449</height>
+ <width>708</width>
+ <height>476</height>
</rect>
</property>
<property name="minimumSize">
@@ -151,6 +151,11 @@
<string>Address Book</string>
</property>
</item>
+ <item>
+ <property name="text">
+ <string>Hooks</string>
+ </property>
+ </item>
</widget>
</item>
<item>
@@ -170,7 +175,7 @@
<item>
<widget class="QStackedWidget" name="stackedWidget_options">
<property name="currentIndex">
- <number>5</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="page_general">
<layout class="QVBoxLayout" name="verticalLayout_18">
@@ -596,7 +601,7 @@
<string>Remove this account</string>
</property>
<property name="icon">
- <iconset>
+ <iconset resource="resources.qrc">
<normaloff>:/images/icons/remove.png</normaloff>:/images/icons/remove.png</iconset>
</property>
<property name="shortcut">
@@ -622,7 +627,7 @@
<string>Add a new account</string>
</property>
<property name="icon">
- <iconset>
+ <iconset resource="resources.qrc">
<normaloff>:/images/icons/add.png</normaloff>:/images/icons/add.png</iconset>
</property>
</widget>
@@ -1144,16 +1149,6 @@
</widget>
</widget>
</item>
- <item>
- <widget class="QWidget" name="widget_fullConfigAudio" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
</layout>
</widget>
<widget class="QWidget" name="page_record">
@@ -1334,6 +1329,152 @@
</item>
</layout>
</widget>
+ <widget class="QWidget" name="page_hooks">
+ <layout class="QVBoxLayout" name="verticalLayout_11">
+ <item>
+ <widget class="QLabel" name="label_configHooks">
+ <property name="text">
+ <string>Configure hooks settings</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_configHooks">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_urlArgument">
+ <property name="title">
+ <string>URL Argument</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_12">
+ <item>
+ <widget class="QWidget" name="widget_protocols" native="true">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>10</width>
+ <height>10</height>
+ </size>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_8">
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QCheckBox" name="checkBox_hooksSIP">
+ <property name="text">
+ <string>SIP Protocol</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="checkBox_hooksIAX">
+ <property name="text">
+ <string>IAX2 Protocol</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QWidget" name="widget_urlArgumentForm" native="true">
+ <layout class="QFormLayout" name="formLayout_6">
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_SIPHeader">
+ <property name="text">
+ <string>SIP Header</string>
+ </property>
+ <property name="buddy">
+ <cstring>lineEdit_SIPHeader</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_command">
+ <property name="text">
+ <string>Command</string>
+ </property>
+ <property name="buddy">
+ <cstring>lineEdit_command</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="lineEdit_SIPHeader"/>
+ </item>
+ <item row="3" column="1">
+ <widget class="QLineEdit" name="lineEdit_command"/>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_phoneNumberFormatting">
+ <property name="title">
+ <string>Phone number formatting</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_13">
+ <item>
+ <widget class="QCheckBox" name="checkBox_addPrefix">
+ <property name="text">
+ <string>Add phone number prefix</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QWidget" name="widget_phoneNumberFormattingForm" native="true">
+ <layout class="QFormLayout" name="formLayout_7">
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_prepend">
+ <property name="text">
+ <string>Prepend</string>
+ </property>
+ <property name="buddy">
+ <cstring>lineEdit_prepend</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="lineEdit_prepend">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_configHooks">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
</widget>
</item>
</layout>
@@ -1387,8 +1528,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
- <x>300</x>
- <y>430</y>
+ <x>301</x>
+ <y>474</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
@@ -1419,12 +1560,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>228</x>
- <y>374</y>
+ <x>130</x>
+ <y>29</y>
</hint>
<hint type="destinationlabel">
- <x>431</x>
- <y>378</y>
+ <x>202</x>
+ <y>31</y>
</hint>
</hints>
</connection>
@@ -1439,8 +1580,8 @@
<y>64</y>
</hint>
<hint type="destinationlabel">
- <x>325</x>
- <y>286</y>
+ <x>446</x>
+ <y>433</y>
</hint>
</hints>
</connection>
@@ -1455,8 +1596,8 @@
<y>89</y>
</hint>
<hint type="destinationlabel">
- <x>682</x>
- <y>98</y>
+ <x>688</x>
+ <y>95</y>
</hint>
</hints>
</connection>
@@ -1467,8 +1608,8 @@
<slot>setValue(int)</slot>
<hints>
<hint type="sourcelabel">
- <x>682</x>
- <y>98</y>
+ <x>688</x>
+ <y>95</y>
</hint>
<hint type="destinationlabel">
<x>352</x>
@@ -1508,5 +1649,21 @@
</hint>
</hints>
</connection>
+ <connection>
+ <sender>checkBox_addPrefix</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>lineEdit_prepend</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>167</x>
+ <y>224</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>231</x>
+ <y>259</y>
+ </hint>
+ </hints>
+ </connection>
</connections>
</ui>
diff --git a/sflphone_kde/configurationmanager_interface.cpp b/sflphone_kde/configurationmanager_interface.cpp
index bbef8fc49bee7a9ca3ab58233be2a80408dae298..2f762231f8f0f80b3b3e270e17ee1f5a2216d038 100644
--- a/sflphone_kde/configurationmanager_interface.cpp
+++ b/sflphone_kde/configurationmanager_interface.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -c ConfigurationManagerInterface -p configurationmanager_interface_p.h:configurationmanager_interface.cpp -i metatypes.h ../sflphone-common/src/dbus/configurationmanager-introspec.xml
+ * Command line was: qdbusxml2cpp -c ConfigurationManagerInterface -p configurationmanager_interface_p.h:configurationmanager_interface.cpp -i metatypes.h configurationmanager-introspec.xml
*
* qdbusxml2cpp is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
*
diff --git a/sflphone_kde/configurationmanager_interface_p.h b/sflphone_kde/configurationmanager_interface_p.h
index e05c27ad5590dda74bebfb252239722daa43a8b7..b3701b22893fd891363082aad83a943a76c0dfcd 100644
--- a/sflphone_kde/configurationmanager_interface_p.h
+++ b/sflphone_kde/configurationmanager_interface_p.h
@@ -1,6 +1,6 @@
/*
* This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -c ConfigurationManagerInterface -p configurationmanager_interface_p.h:configurationmanager_interface.cpp -i metatypes.h ../sflphone-common/src/dbus/configurationmanager-introspec.xml
+ * Command line was: qdbusxml2cpp -c ConfigurationManagerInterface -p configurationmanager_interface_p.h:configurationmanager_interface.cpp -i metatypes.h configurationmanager-introspec.xml
*
* qdbusxml2cpp is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
*
@@ -8,8 +8,8 @@
* Do not edit! All changes made to it will be lost.
*/
-#ifndef CONFIGURATIONMANAGER_INTERFACE_P_H_1241041401
-#define CONFIGURATIONMANAGER_INTERFACE_P_H_1241041401
+#ifndef CONFIGURATIONMANAGER_INTERFACE_P_H_1241106716
+#define CONFIGURATIONMANAGER_INTERFACE_P_H_1241106716
#include <QtCore/QObject>
#include <QtCore/QByteArray>
@@ -69,12 +69,6 @@ public Q_SLOTS: // METHODS
return asyncCallWithArgumentList(QLatin1String("getActiveCodecList"), argumentList);
}
- inline QDBusPendingReply<QStringList> getAddressbookList()
- {
- QList<QVariant> argumentList;
- return asyncCallWithArgumentList(QLatin1String("getAddressbookList"), argumentList);
- }
-
inline QDBusPendingReply<MapStringInt> getAddressbookSettings()
{
QList<QVariant> argumentList;
@@ -302,13 +296,6 @@ public Q_SLOTS: // METHODS
return asyncCallWithArgumentList(QLatin1String("setAccountDetails"), argumentList);
}
- inline QDBusPendingReply<> setAccountsOrder(const QString &order)
- {
- QList<QVariant> argumentList;
- argumentList << qVariantFromValue(order);
- return asyncCallWithArgumentList(QLatin1String("setAccountsOrder"), argumentList);
- }
-
inline QDBusPendingReply<> setActiveCodecList(const QStringList &list)
{
QList<QVariant> argumentList;
@@ -316,13 +303,6 @@ public Q_SLOTS: // METHODS
return asyncCallWithArgumentList(QLatin1String("setActiveCodecList"), argumentList);
}
- inline QDBusPendingReply<> setAddressbookList(const QStringList &settings)
- {
- QList<QVariant> argumentList;
- argumentList << qVariantFromValue(settings);
- return asyncCallWithArgumentList(QLatin1String("setAddressbookList"), argumentList);
- }
-
inline QDBusPendingReply<> setAddressbookSettings(MapStringInt settings)
{
QList<QVariant> argumentList;
diff --git a/sflphone_kde/sflphone_const.h b/sflphone_kde/sflphone_const.h
index 9ce756656c9ea220e55ea01d9c946d78e7b20b6e..5683c86cdbf76a443fa5dd2bd418ce367d394977 100644
--- a/sflphone_kde/sflphone_const.h
+++ b/sflphone_kde/sflphone_const.h
@@ -140,6 +140,12 @@
#define ADDRESSBOOK_DISPLAY_HOME "ADDRESSBOOK_DISPLAY_PHONE_HOME"
#define ADDRESSBOOK_DISPLAY_MOBILE "ADDRESSBOOK_DISPLAY_PHONE_MOBILE"
+#define HOOKS_ADD_PREFIX "PHONE_NUMBER_HOOK_ADD_PREFIX"
+#define HOOKS_ENABLED "PHONE_NUMBER_HOOK_ENABLED"
+#define HOOKS_COMMAND "URLHOOK_COMMAND"
+#define HOOKS_IAX2_ENABLED "URLHOOK_IAX2_ENABLED"
+#define HOOKS_SIP_ENABLED "URLHOOK_SIP_ENABLED"
+#define HOOKS_SIP_FIELD "URLHOOK_SIP_FIELD"