diff --git a/sflphone-client-kde/Account.cpp b/sflphone-client-kde/Account.cpp
index 3b6cc5843beb2074d9a787c143851d70bf335821..76b5c025c1ccc6b19dbd5e7957b330eba7864a03 100644
--- a/sflphone-client-kde/Account.cpp
+++ b/sflphone-client-kde/Account.cpp
@@ -217,6 +217,15 @@ void Account::setAccountDetail(QString param, QString val)
(*accountDetails)[param] = val;
}
+void Account::setAccountId(QString id)
+{
+ if (! isNew())
+ {
+ qDebug() << "Error : setting AccountId of an existing account.";
+ }
+ *accountId = id;
+}
+
//Operators
bool Account::operator==(const Account& a)const
{
diff --git a/sflphone-client-kde/Call.cpp b/sflphone-client-kde/Call.cpp
index 45cd652ca3bb353a3f4fad3f04418817f1843adc..2741c27596acf2ab8efea03412c99c60fa2fa439 100644
--- a/sflphone-client-kde/Call.cpp
+++ b/sflphone-client-kde/Call.cpp
@@ -49,7 +49,7 @@ const call_state Call::stateChangedStateMap [11][6] =
{
// RINGING CURRENT BUSY HOLD HUNGUP FAILURE
/*INCOMING */ {CALL_STATE_INCOMING , CALL_STATE_CURRENT , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_OVER , CALL_STATE_FAILURE },
-/*RINGING */ {CALL_STATE_ERROR , CALL_STATE_CURRENT , CALL_STATE_BUSY , CALL_STATE_ERROR , CALL_STATE_OVER , CALL_STATE_FAILURE },
+/*RINGING */ {CALL_STATE_RINGING , CALL_STATE_CURRENT , CALL_STATE_BUSY , CALL_STATE_ERROR , CALL_STATE_OVER , CALL_STATE_FAILURE },
/*CURRENT */ {CALL_STATE_ERROR , CALL_STATE_CURRENT , CALL_STATE_ERROR , CALL_STATE_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },
/*DIALING */ {CALL_STATE_RINGING , CALL_STATE_CURRENT , CALL_STATE_BUSY , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_FAILURE },
/*HOLD */ {CALL_STATE_ERROR , CALL_STATE_CURRENT , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_OVER , CALL_STATE_FAILURE },
diff --git a/sflphone-client-kde/ConfigDialog.cpp b/sflphone-client-kde/ConfigDialog.cpp
index f92450fc2aab31a9d69695a21d8589f164d150f6..5768beb8a33eaa2cbe6150278579505c4ccfc043 100644
--- a/sflphone-client-kde/ConfigDialog.cpp
+++ b/sflphone-client-kde/ConfigDialog.cpp
@@ -130,23 +130,23 @@ void ConfigurationDialog::loadOptions()
//
//alsa settings
comboBox1_alsaPlugin->clear();
- QStringList pluginList = configurationManager.getOutputAudioPluginList();
- comboBox1_alsaPlugin->addItems(pluginList);
- //comboBox1_alsaPlugin->setCurrentIndex(comboBox1_alsaPlugin->findText(configurationManager.getCurrentAudioOutputPlugin()));
+// QStringList pluginList = configurationManager.getOutputAudioPluginList();
+// comboBox1_alsaPlugin->addItems(pluginList);
+// comboBox1_alsaPlugin->setCurrentIndex(comboBox1_alsaPlugin->findText(configurationManager.getCurrentAudioOutputPlugin()));
QStringList devices = configurationManager.getCurrentAudioDevicesIndex();
int inputDevice = devices[1].toInt();
comboBox2_in->clear();
- QStringList inputDeviceList = configurationManager.getAudioInputDeviceList();
- comboBox2_in->addItems(inputDeviceList);
+// QStringList inputDeviceList = configurationManager.getAudioInputDeviceList();
+// comboBox2_in->addItems(inputDeviceList);
comboBox2_in->setCurrentIndex(inputDevice);
int outputDevice = devices[0].toInt();
comboBox3_out->clear();
- QStringList outputDeviceList = configurationManager.getAudioOutputDeviceList();
- comboBox3_out->addItems(inputDeviceList);
- comboBox3_out->setCurrentIndex(outputDevice);
+// QStringList outputDeviceList = configurationManager.getAudioOutputDeviceList();
+// comboBox3_out->addItems(outputDeviceList);
+// comboBox3_out->setCurrentIndex(outputDevice);
//pulseaudio settings
checkBox_pulseAudioVolumeAlter->setCheckState(configurationManager.getPulseAppVolumeControl() ? Qt::Checked : Qt::Unchecked);
@@ -320,11 +320,11 @@ void ConfigurationDialog::loadAccountList()
void ConfigurationDialog::saveAccountList()
{
+ //get the configurationManager instance
+ ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
//save the account being edited
if(listWidget_accountList->currentItem())
saveAccount(listWidget_accountList->currentItem());
- //get the configurationManager instance
- ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
//ask for the list of accounts ids to the configurationManager
QStringList accountIds= QStringList(configurationManager.getAccountList().value());
//create or update each account from accountList
@@ -334,14 +334,16 @@ void ConfigurationDialog::saveAccountList()
//if the account has no instanciated id, it has just been created in the client
if(current.isNew())
{
- currentId = configurationManager.addAccount(current.getAccountDetails());
+ MapStringString details = current.getAccountDetails();
+ currentId = configurationManager.addAccount(details);
+ current.setAccountId(currentId);
}
//if the account has an instanciated id but it's not in configurationManager
else{
if(! accountIds.contains(current.getAccountId()))
{
qDebug() << "The account with id " << current.getAccountId() << " doesn't exist. It might have been removed by another SFLPhone client.";
- currentId = QString("");
+ currentId = QString();
}
else
{
@@ -648,6 +650,7 @@ void ConfigurationDialog::on_toolButton_accountsApply_clicked()
{
qDebug() << "on_toolButton_accountsApply_clicked";
saveAccountList();
+ loadAccountList();
}
diff --git a/sflphone-client-kde/doc/en/sflphone-client-kde/advanced-use.docbook b/sflphone-client-kde/doc/en/sflphone-client-kde/advanced-use.docbook
new file mode 100644
index 0000000000000000000000000000000000000000..8d1c8b69c3fce7bea45c73efd06983e3c419a92f
--- /dev/null
+++ b/sflphone-client-kde/doc/en/sflphone-client-kde/advanced-use.docbook
@@ -0,0 +1 @@
+
diff --git a/sflphone-client-kde/doc/en/sflphone-client-kde/basic-use.docbook b/sflphone-client-kde/doc/en/sflphone-client-kde/basic-use.docbook
new file mode 100644
index 0000000000000000000000000000000000000000..529a53660bf9e1a3319597de88514a845044ca62
--- /dev/null
+++ b/sflphone-client-kde/doc/en/sflphone-client-kde/basic-use.docbook
@@ -0,0 +1,106 @@
+<chapter id="basic-use">
+
+<chapterinfo>
+<authorgroup>
+<author><firstname>Jérémy</firstname><surname>Quentin</surname></author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+</chapterinfo>
+
+<title>Basic use of &sflphone-client-kde;</title>
+
+<para>Although &sflphone; is enterprise oriented, its interface is very easy to use and you can use the basic features without any particular skills or knowings.</para>
+
+<sect1 id="basic-use-mainwindow">
+<title>Presentation of the main window</title>
+
+<para>The main window is composed of three main parts : the &actions-p;, the &screen-p; and the &dialpad; (although you can hide the two last ones in the Settings menu). The screen part has three positions.
+The ¤t-w; : it is the one you are by default, it shows the current, dialing and incoming calls.
+The &history-w; : it shows the past calls and enables you to call someone you called earlier or from whom you missed a call.
+The &address-w; : it enables you to look in the address book of KDE and to call somebody if his number is available.
+
+To switch between those windows, click on the history and address book buttons. If none of these buttons is triggerred, you are currently in the ¤t-w;, if the history button is triggerred, you are in the &history-w;, and if the address book button is triggerred, you are in the &address-w;.
+
+</para>
+
+</sect1>
+
+
+<sect1 id="basic-use-call">
+<title>Calling somebody</title>
+
+<sect2 id="basic-use-call-current">
+<title>Dialing one's number</title>
+
+
+<para> If you know the number of the people you want to call, you may just type it on the dialpad or on your keyboard while you are in the ¤t-w;, then click on the Accept button in the &actions-p;'s toolbar or in the "actions" menu, or type enter on your keyboard, or even double-click on the number to call once you have finished dialing it.</para>
+
+Following behaviour, common part...
+
+</sect2>
+
+<sect2 id="basic-use-call-history">
+<title>Calling from call history</title>
+
+
+<para> If you want to call somebody from whom you missed a call, or you already called earlier, you may go to the &history-w;. The detailed use of this window and its features (search...) is described in this section. Once you are in it, find the number or name of the person you want to call, then select it and click on the Accept button in the &actions-p;'s toolbar or in the "actions" menu, or type enter on your keyboard, or double-click on the number.</para>
+
+<para>The screen will come back to the ¤t-w; with a new ringing call with the number you chose in the &history-w;.</para>
+
+<para> Note that you can also right click and select Edit before call to modify the number in the history before calling it.</para>
+
+Following behaviour, common part...
+
+</sect2>
+
+<sect2 id="basic-use-call-address">
+<title>Calling from address book</title>
+
+
+<para> If you have your KAddressBook configured and filled with some phone numbers, you can go to the &address;. The detailed use of this window and its features (search...) is described in this section. Once you are in it, find the name of the person you want to call with the right phone number (&pt-home;, &pt-work; or &pt-cell;), then select it and click on the Accept button in the &actions-p;'s toolbar or in the "actions" menu, or type enter on your keyboard, or double-click on the number.</para>
+
+<para>The screen will come back to the ¤t-w; with a new ringing call with the number you chose in the &address;.</para>
+
+<para> Note that you can also right click and select Edit before call to modify the number in the address book before calling it.</para>
+
+Following behaviour, common part...
+
+</sect2>
+
+</sect1>
+
+<sect1 id="basic-use-becalled">
+<title>Receiving a call</title>
+
+
+<para> When one of the account registered in &sflphone; receives an incoming call, it will be displayed as a new item in the ¤t; with the "incoming" icon. You can either accept or refuse it. To accept it, select the item and click on the Accept button which replaced the Call button in toolbar and Actions menu, or double click the item, or type Enter. To refuse it, select it and click on the refuse button that replaced the Hang up button in toolbar and Actions menu or type Escape.</para>
+
+Following behaviour, common part...
+
+</sect1>
+
+
+<sect1 id="basic-use-ringing">
+<title>The call is ringing</title>
+
+
+<para> Once you called a number, the call is normally in ringing state. It will then pass to Current or Busy state, according to the decision of the called peer to accept or refuse the call. If it's in Busy state, you can just hang it up with the Hang up button or typing Escape.
+</para>
+
+<para>If the number doesn't exist or if any other error occured (see the list of common errors here), it is in failure state, then you can Hang it up with the Hang up button or typing Escape. </para>
+
+Following behaviour, common part...
+
+</sect1>
+
+<sect1 id="basic-use-current">
+<title>The call is current</title>
+
+
+<para> Once the call is in current state, you can now communicate with your peer. You have a bunch of useful features when in current state that are described in the common use chapter. To end the call, select it and click on Hang up button in toolbar or type Escape. </para>
+
+</sect1>
+
+
+
+</chapter>
diff --git a/sflphone-client-kde/doc/en/sflphone-client-kde/common-use.docbook b/sflphone-client-kde/doc/en/sflphone-client-kde/common-use.docbook
new file mode 100644
index 0000000000000000000000000000000000000000..b86bdd405a4a4066bba007e38409107ffe724acf
--- /dev/null
+++ b/sflphone-client-kde/doc/en/sflphone-client-kde/common-use.docbook
@@ -0,0 +1,133 @@
+<chapter id="common-use">
+
+<chapterinfo>
+<authorgroup>
+<author><firstname>Jérémy</firstname><surname>Quentin</surname></author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+</chapterinfo>
+
+<title>Common use of &sflphone-client-kde;</title>
+
+<sect1 id="common-use-current">
+<title>Handling a call</title>
+
+<para>There are a bunch of features that you can apply on a current call with &sflphone;. Here are their descriptions.
+</para>
+
+<sect2 id="common-use-current-new">
+<title>Placing a new call</title>
+
+<para> You can have plenty of calls in parallel, even if only one is current (ie : you can talk through) and the others are on hold. To place a new call when you are on a current call, click on the Place new call button, it will create a new empty item and select it automatically, then type the phone number you want to call and click Call or type Enter to place the call. You can also go to the &history-w; or the &address-w; and valid a call, and it will be added ringing in the ¤t-w;. When a new call is placed, any other one is put on hold, so that you can't mix two calls. If you want to go back to one of the calls put on hold, just double-click on the corresponding item and it will go back to current state while the old one is put on hold.
+</para>
+
+</sect2>
+
+<sect2 id="common-use-current-hold">
+<title>Holding a call</title>
+
+<para> If you want to place the current call on hold, you just have to click on the Hold button. The icon of the call will then be changed and communication is paused with your peer. You can then place a new call, transfer the held one (see transf...)... To take the communication back, just double-click on the item or click on Unhold button.
+</para>
+
+</sect2>
+
+<sect2 id="common-use-current-transfer">
+<title>Transfering a call</title>
+
+<para> If you want to transfer the current call to another phone number, click on the transfer button, the item will change and enable you to type the number to which you want to transfer your peer. Once you've typed it, click on Valid transfer button or type Enter to effectively transfer the call. You can place the call on hold while typing the number (see hold).
+</para>
+
+</sect2>
+
+<sect2 id="common-use-current-record">
+<title>Recording a call</title>
+
+<para> If you want to record the current call, click on the record button, the button will become triggered and the light may come on. Since &sflphone; only records calls when they are current (ie : not on hold), the light will be on if the selected call is current and can be recorded, and off if it's not. But if the button is triggered, &sflphone; will record as soon as it's communicating.
+</para>
+
+</sect2>
+
+</sect1>
+
+<sect1 id="common-use-mailbox">
+<title>Call mailbox</title>
+
+<para>You can call your mailbox typing your account's mailbox number. But if you have registered this number in account's settings, you can just click on Mailbox button. It will call the mailbox of the first registered account.</para>
+
+<para> In both case, you can then type your mailbox's password without worrying about people around, since &sflphone; will not display what you type if the called number is the registered mailbox number of the current call's account.
+</para>
+
+</sect1>
+
+<sect1 id="common-use-address">
+<title>Use the address book</title>
+
+<para>&sflphonekde; communicates with the KDE Address Book and gathers all the phone numbers matching your request and the options chosen. Here we will explain how to configure and use it.</para>
+
+
+<sect2 id="common-use-address-kde">
+<title>Configuring KDE Address Book</title>
+
+<para> As it is fully designed for KDE, &sflphonekde; looks for your contacts in KDE Address Book. So you first have to configure it. In the K Menu of your KDE, go to Applications,then Bureautique (??), then choose Address Book. You are now in the main window of the KDE address book. You can add contacts and handle them from here. Type F1 to see this application's help page if you have some problems with it.
+</para>
+
+<para> &sflphonekde; looks into the standard address book, that means it will look into the contacts displayed in the contact list on the left of the window. The selected address books in the bottom left of the window will be searched. If you add some contacts, you may have to restart &sflphonekde; before it can see them.
+</para>
+
+
+</sect2>
+
+
+<sect2 id="common-use-address-config">
+<title>Configuring &sflphonekde;</title>
+
+<para> You can now go to the Configuration Dialog to choose how &sflphone; will handle your searches in the address book. This step is optionnal though, because the default settings enable you to use the feature without more setup.
+</para>
+
+<para> The maximum results setting enables you to choose how many phone numbers can be displayed when you look for a contact. KDE address book can contain lots of contacts, especially if connected to LDAP directories, and you don't want to see thousands of contacts displayed as soon as you type a letter to search for.</para>
+
+<para> KDE address book can contain a photo for your contacts. &sflphonekde; can display it in the result of your searches, but as it can take a little more time, you can choose to disable that feature.</para>
+
+<para> Each phone number in KDE address book is linked to a contact, and has a phone number type to differentiate work phones, home phones, and cell phones. You can choose to display only certain of those numbers. Check the types you are interested in and uncheck the other ones.</para>
+
+</sect2>
+
+<sect2 id="common-use-address-use">
+<title>Search in Address Book</title>
+
+<para> Now that everything is set up, you can go to the &address-w;, then type some letters of the name you want to phone. You will see all the phone numbers that match your request and their type. When the resulting list's size is greater than the maximum chosen in configuration, it will only display the beginning of the list with the max size, and will display a warning message to let you know that your wanted number may be in the rest of the list and so not displayed. In that case you should type some more letters to improve precision of the search. Once you found the right number, double click on the item to call it.
+</para>
+
+</sect2>
+
+
+</sect1>
+
+
+
+<sect1 id="common-use-config">
+<title>Configuration Dialog</title>
+
+<para> There are a lot of options in &sflphone;. All of them are gathered and sorted in the Configuration Dialog. You can reach it clicking Configure SFLPhone in the Settings menu. Here are presented some commonly useful options</para>
+
+<sect2 id="common-use-config-address">
+<title>General settings</title>
+
+<para> Here you can choose the capacity of the call history.
+</para>
+
+</sect2>
+
+</sect1>
+
+
+
+
+
+
+
+
+
+
+
+</chapter>
\ No newline at end of file
diff --git a/sflphone-client-kde/doc/en/sflphone-client-kde/getting-started.docbook b/sflphone-client-kde/doc/en/sflphone-client-kde/getting-started.docbook
new file mode 100644
index 0000000000000000000000000000000000000000..38612c0c03dc4127eb0714f6d95666b481ec6a96
--- /dev/null
+++ b/sflphone-client-kde/doc/en/sflphone-client-kde/getting-started.docbook
@@ -0,0 +1,175 @@
+<chapter id="getting-started">
+
+<chapterinfo>
+<authorgroup>
+<author><firstname>Jérémy</firstname><surname>Quentin</surname></author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+</chapterinfo>
+
+<title>Getting Started with &sflphone-client-kde;</title>
+
+<para>When you start &sflphone-client-kde; for the first time, you get an account configuration wizard. This wizard will help you setting up an account for &sflphone; to use. You should complete the wizard before going to the main window of &sflphone-client-kde; for it will not work without at least one account set up.
+You can still change all the settings of the account from the main window after the wizard is complete. You can also start the wizard from the main window at any time.
+We will now describe the different options of this wizard.</para>
+
+<simplelist>
+<member><link linkend="gettingstarted-welcome">The wizard introduction page.</link></member>
+<member><link linkend="gettingstarted-createorregister">The registering type page.</link></member>
+<member><link linkend="gettingstarted-create">Creating a new account.</link></member>
+<member><link linkend="gettingstarted-register">Register an existing account.</link></member>
+<member><link linkend="gettingstarted-stun">The STUN settings.</link></member>
+<member><link linkend="gettingstarted-finish">The conclusion page.</link></member>
+</simplelist>
+
+<sect2 id="gettingstarted-wizard-welcome">
+<title>Welcoming page</title>
+
+<screenshot>
+<mediaobject>
+<imageobject>
+<imagedata fileref="wizard-welcome.png" format="PNG"/>
+</imageobject>
+<caption>
+<para>The wizard introduction page</para>
+</caption>
+</mediaobject>
+</screenshot>
+
+
+<para>You can navigate in this wizard using the <I>Next</I>, <I>Previous</I> and <I>Cancel</I> buttons. If you click on the <I>Cancel</I> button, the wizard will shut down without adding the account. Click on the <I>Next</I> button to start configuring the account</para>
+
+</sect2>
+
+
+<sect2 id="gettingstarted-wizard-createorregister">
+<title>Create or register</title>
+
+<screenshot>
+<mediaobject>
+<imageobject>
+<imagedata fileref="wizard-createorregister.png" format="PNG"/>
+</imageobject>
+<caption>
+<para>The registering type page</para>
+</caption>
+</mediaobject>
+</screenshot>
+
+<para>You can now choose to create a new account hosted by sflphone.org or register an existing account that you own.
+If you use &sflphone; for the first time and want to make things work the simplest way possible, you should choose <I>create a new account</I>. It will create an account and add it to &sflphone;.
+If you already have a SIP or IAX account created with &sflphone; or by any other way, you can add it to &sflphone; by choosing <I>register an existing account</I>.
+</para>
+
+</sect2>
+
+<sect2 id="gettingstarted-wizard-create">
+<title>Creating a new account</title>
+
+If you choose to create an account on sflphone.org, the wizard will need very few informations to create the account, create it automatically and add the informations of the new account in &sflphone;. It creates a SIP account, so you will then be able to use this new account from any other system, with any software handling SIP accounts, using the informations of the new account that are displayed at the end of the process or reachable from the main window.
+
+<sect3 id="gettingstarted-wizard-create-email">
+<title>Email address</title>
+
+<screenshot>
+<mediaobject>
+<imageobject>
+<imagedata fileref="wizard-create-email.png" format="PNG"/>
+</imageobject>
+<caption>
+<para>The email address page</para>
+</caption>
+</mediaobject>
+</screenshot>
+
+<para>The first information it will ask for is your email address. This is non-obligatory, so you can just skip that step by clicking <I>Next</I> button. But it will enable you to receive some notifications about the voice or text messages you receive while you're away.</para>
+
+
+</sect3>
+
+</sect2>
+
+<sect2 id="gettingstarted-wizard-register">
+<title>Register an existing account</title>
+
+<para> If you have already created a SIP or IAX account with &sflphone; from another computer or with another software, or if you want to use an existing account, you can register it with this wizard to be able to use it with this instance of &sflphone;. The wizard will ask you for the basic informations of this account in order to find it back. These informations are described in this section.</para>
+
+
+
+<sect3 id="gettingstarted-wizard-register-siporiax">
+<title>SIP or IAX</title>
+
+<screenshot>
+<mediaobject>
+<imageobject>
+<imagedata fileref="wizard-register-siporiax.png" format="PNG"/>
+</imageobject>
+<caption>
+<para>The account type page</para>
+</caption>
+</mediaobject>
+</screenshot>
+
+<para> &sflphone; handles two protocols for calls, SIP and IAX2. The wizard will now ask you which of those is your account. If you already have an account created, just choose the right type. If you want to create one without &sflphone; and you wonder which type to choose, you can refer to <ulink url="http://www.voip-info.org/wiki/view/IAX+versus+SIP">this document</ulink> to know which one feets your needs best. </para>
+
+</sect3>
+
+<sect3 id="gettingstarted-wizard-register-settings">
+<title>Account settings</title>
+
+<screenshot>
+<mediaobject>
+<imageobject>
+<imagedata fileref="wizard-register-settings.png" format="PNG"/>
+</imageobject>
+<caption>
+<para>The settings page</para>
+</caption>
+</mediaobject>
+</screenshot>
+
+<para> The wizard needs a few informations to find your account. The alias is for convenience only, you can choose anyone. It will be applied only on &sflphone; on this system, not in the account. Server is the one that hosts your account. User is the username of the account. Unlike the alias, it has to be the username chosen while creating the account. Password is also the one chosen for the account. Mailbox number will be used by the mailbox button to keep you from having to type that number too often. Usually it is 888.</para>
+
+</sect3>
+
+</sect2>
+
+<sect2 id="gettingstarted-wizard-stun">
+<title>STUN settings</title>
+
+<screenshot>
+<mediaobject>
+<imageobject>
+<imagedata fileref="wizard-stun.png" format="PNG"/>
+</imageobject>
+<caption>
+<para>The STUN page</para>
+</caption>
+</mediaobject>
+</screenshot>
+
+<para>If you register a SIP account or create it on sflphone.org (that also means registering a SIP account after all), the wizard proposes you to enable STUN. You may want to do it if you are connected under a firewall. Actually, this is not an option of this account in particular, but of the &sflphone; configuration; it will be applied for any account. If you enable this option, you have to choose the STUN server you want to use (example : stunserver.org).</para>
+
+</sect2>
+
+
+<sect2 id="gettingstarted-wizard-finish">
+<title>The conclusion page</title>
+
+<screenshot>
+<mediaobject>
+<imageobject>
+<imagedata fileref="wizard-finish.png" format="PNG"/>
+</imageobject>
+<caption>
+<para>The final page</para>
+</caption>
+</mediaobject>
+</screenshot>
+
+<para> The conclusion page resumes the informations you have sent during the wizard process. It has not done anything yet so you can still give up clicking <I>Cancel</I> button. If you click on <I>Finish</I>, it will send all the information and create the account if you chose to create it or register it if you were registering an existing account. As it has not sent the informations at this step, it cannot know if the registration will succeed. To check this, once you are in the main window, go to the account settings page to see the state of your accounts. </para>
+
+</sect2>
+
+
+</chapter>
diff --git a/sflphone-client-kde/doc/en/sflphone-client-kde/index.docbook b/sflphone-client-kde/doc/en/sflphone-client-kde/index.docbook
new file mode 100644
index 0000000000000000000000000000000000000000..a6ced38a36b67251496447088c2725c87cbcfa23
--- /dev/null
+++ b/sflphone-client-kde/doc/en/sflphone-client-kde/index.docbook
@@ -0,0 +1,100 @@
+<?xml version="1.0" ?>
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+ <!ENTITY sflphone-client-kde "SFLPhone KDE Client">
+ <!ENTITY kappname "&sflphone-client-kde;">
+ <!ENTITY sflphonerelease "0.9.6">
+<!ENTITY current-w "Current calls window">
+<!ENTITY history-w "Call history window">
+<!ENTITY address-w "Address book window">
+
+ <!ENTITY sflphone "SFLPhone">
+ <!ENTITY % addindex "IGNORE">
+ <!ENTITY % English "INCLUDE" >
+
+ <!-- chapters in separate docbook files -->
+ <!ENTITY introduction SYSTEM "introduction.docbook">
+ <!ENTITY getting-started SYSTEM "getting-started.docbook">
+ <!ENTITY normal-use SYSTEM "normal-use.docbook">
+ <!ENTITY advanced-use SYSTEM "advanced-use.docbook">
+]>
+
+<book lang="&language;">
+<bookinfo>
+ <title>&sflphone-client-kde; User Manual</title>
+ <date>2009-05-10</date>
+ <releaseinfo>&sflphonerelease;</releaseinfo>
+
+ <authorgroup>
+ <author>
+ <firstname>Jérémy</firstname>
+ <surname>Quentin</surname>
+ <affiliation>
+ <address><email>jeremy.quentin@savoirfairelinux.com</email></address>
+ </affiliation>
+ </author>
+ </authorgroup>
+
+ <copyright>
+ <year>2009</year>
+ <holder>Savoir faire linux</holder>
+ </copyright>
+
+ <legalnotice>&FDLNotice;</legalnotice>
+
+ <abstract>
+ <para>&sflphone-client-kde; is a KDE client for &sflphone;, a robust enterprise-class desktop phone. </para>
+ </abstract>
+
+ <keywordset>
+ <keyword>KDE</keyword>
+ <keyword>SFLPhone</keyword>
+ <keyword>client</keyword>
+ <keyword>phone</keyword>
+ <keyword>enterprise</keyword>
+ </keywordset>
+
+</bookinfo>
+
+
+&introduction;
+&getting-started;
+&normal-use;
+&advanced-use;
+
+<appendix id="app-bibliography">
+<title>Bibliography</title>
+
+<para>(... to be written ...)</para>
+
+<bibliography id="bibliography">
+
+<biblioentry>
+<title><ulink url="info://sflphone-client-kde/Top">&sflphonekde; Manual</ulink></title>
+<authorgroup>
+<author><firstname>Jérémy</firstname><surname>Quentin</surname></author>
+</authorgroup>
+</biblioentry>
+
+<biblioentry>
+<title><ulink url="http://en.wikipedia.org/wiki/Session_Initiation_Protocol">SIP Wiki</ulink></title>
+</biblioentry>
+
+<biblioentry>
+<title><ulink url="http://en.wikipedia.org/wiki/IAX">IAX Wiki</ulink></title>
+</biblioentry>
+
+<biblioentry>
+<title><ulink url="http://www.asterisk.org/">Asterisk webpage</ulink></title>
+</biblioentry>
+
+<biblioentry>
+<title><ulink url="http://en.wikipedia.org/wiki/STUN">STUN wiki</ulink></title>
+</biblioentry>
+
+</bibliography>
+
+</appendix>
+
+<!-- &documentation.index; -->
+
+</book>
diff --git a/sflphone-client-kde/doc/en/sflphone-client-kde/introduction.docbook b/sflphone-client-kde/doc/en/sflphone-client-kde/introduction.docbook
new file mode 100644
index 0000000000000000000000000000000000000000..cbf8c1a26337a5004504588972aa07b71cb215b5
--- /dev/null
+++ b/sflphone-client-kde/doc/en/sflphone-client-kde/introduction.docbook
@@ -0,0 +1,14 @@
+<chapter id="introduction">
+<title>Introduction</title>
+
+
+<para>
+This user manual is intended to describe the contents and use of the &sflphone-client-kde; &sflphonerelease; softphone.
+&sflphone-client-kde; is a KDE client for &sflphone;.It communicates with the core side through DBus.
+&sflphone; is meant to be a robust enterprise-class desktop phone.
+It provides functions like call transfer, call hold, multiple lines, multiple accounts support.
+It is SIP and IAX2 compatible.
+&sflphone; audio layer is build upon a native ALSA interface and and a native PulseAudio interface.
+</para>
+
+</chapter>
diff --git a/sflphone-client-kde/doc/en/sflphone-client-kde/wizard-create-email.png b/sflphone-client-kde/doc/en/sflphone-client-kde/wizard-create-email.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fdbcb8cdcbe2577262c235c5dd7403f67ddf5ee
Binary files /dev/null and b/sflphone-client-kde/doc/en/sflphone-client-kde/wizard-create-email.png differ
diff --git a/sflphone-client-kde/doc/en/sflphone-client-kde/wizard-createorregister.png b/sflphone-client-kde/doc/en/sflphone-client-kde/wizard-createorregister.png
new file mode 100644
index 0000000000000000000000000000000000000000..a10bd918ab3acb236f52d0ae630209d742956932
Binary files /dev/null and b/sflphone-client-kde/doc/en/sflphone-client-kde/wizard-createorregister.png differ
diff --git a/sflphone-client-kde/doc/en/sflphone-client-kde/wizard-finish.png b/sflphone-client-kde/doc/en/sflphone-client-kde/wizard-finish.png
new file mode 100644
index 0000000000000000000000000000000000000000..3514b1ef0b4352f91c9909fcf77bb8136a9a8c80
Binary files /dev/null and b/sflphone-client-kde/doc/en/sflphone-client-kde/wizard-finish.png differ
diff --git a/sflphone-client-kde/doc/en/sflphone-client-kde/wizard-register-settings.png b/sflphone-client-kde/doc/en/sflphone-client-kde/wizard-register-settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac8a70122a69a238d95b8e14fc434807b1db043f
Binary files /dev/null and b/sflphone-client-kde/doc/en/sflphone-client-kde/wizard-register-settings.png differ
diff --git a/sflphone-client-kde/doc/en/sflphone-client-kde/wizard-register-siporiax.png b/sflphone-client-kde/doc/en/sflphone-client-kde/wizard-register-siporiax.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c49501267889d58cba5ad61465546f1f8a7b3b1
Binary files /dev/null and b/sflphone-client-kde/doc/en/sflphone-client-kde/wizard-register-siporiax.png differ
diff --git a/sflphone-client-kde/doc/en/sflphone-client-kde/wizard-stun.png b/sflphone-client-kde/doc/en/sflphone-client-kde/wizard-stun.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a958554c19ea9e4d6c17898a4ef8945a8c0a59e
Binary files /dev/null and b/sflphone-client-kde/doc/en/sflphone-client-kde/wizard-stun.png differ
diff --git a/sflphone-client-kde/doc/en/sflphone-client-kde/wizard-welcome.png b/sflphone-client-kde/doc/en/sflphone-client-kde/wizard-welcome.png
new file mode 100644
index 0000000000000000000000000000000000000000..d732be6eec55cee995448b7d22e25f072a18c6c0
Binary files /dev/null and b/sflphone-client-kde/doc/en/sflphone-client-kde/wizard-welcome.png differ