Git commit 7b23c14a164d656e2c86799be2546c381ed8926a by Emmanuel Lepage Vallee.
Committed on 15/07/2014 at 15:39.
Pushed by lepagevalleeemmanuel into branch 'master'.

[ #51339 ] Update docbook

M  +25   -0    doc/advanced-use.docbook
M  +20   -0    doc/basic-use.docbook
M  +10   -4    src/conf/dlgaccountsbase.ui

http://commits.kde.org/sflphone-kde/7b23c14a164d656e2c86799be2546c381ed8926a

diff --git a/doc/advanced-use.docbook b/doc/advanced-use.docbook
index d7c44a2..22beae9 100644
--- a/doc/advanced-use.docbook
+++ b/doc/advanced-use.docbook
@@ -42,6 +42,16 @@
 
        </sect1>
 
+        <sect1 id="advanced-use-macro">
+                <title>Macros</title>
+                <para>
+                   Macros are used to automate some type of calls. The basic 
use case is to assign a phone number to a keyboard shortcut. To do so, a new 
macro have to be created in the configuration dialog "accessibility" section. 
It can then be assigned to a shortcut either in the dialog itself or in the 
dedicated shortcut dialog. It is also possible add a macro to the toolbar using 
the dedicated dialog.
+                </para>
+                <para>
+                   Macros also support the "\n" escape sequence to emulate the 
effect of the "Enter" keyboard key and the "Pick up" button. The time between 
each keystroke is also configurable to match some PXB dial plan configuration 
(such as phone extensions or audio menu).
+                </para>
+        </sect1>
+
        <sect1 id="advanced-use-codecs">
                <title>Codecs</title>
 
@@ -54,6 +64,21 @@
 
        </sect1>
 
+        <sect1 id="advanced-use-video">
+                <title>Video</title>
+
+                <para>
+                        &sflphone; versions higher than 1.1.2 have built in 
support for video calls. This feature work mostly the same way as the audio 
codecs. An option as also available to disable video transmission.
+                </para>
+                <para>
+                        During a video call, some display options are 
available to change the aspect ratio or rotate the video. By pressing the 
advanced settings button, it is also possible to switch from different camera, 
disable video, stream a file or share your screen(s). Sharing a file is also 
accessible by drag and dropping it on top of the video window.
+                </para>
+                <para>
+                        Video devices settings can be configured from the 
configuration window "video" section.
+                </para>
+
+        </sect1>
+
                
                
 </chapter>
\ No newline at end of file
diff --git a/doc/basic-use.docbook b/doc/basic-use.docbook
index d61a1ea..6c00f02 100644
--- a/doc/basic-use.docbook
+++ b/doc/basic-use.docbook
@@ -93,6 +93,22 @@ The contact list provide an easy access to KDE address book 
contacts. By default
 
 </sect2>
 
+<sect2 id="basic-use-presence">
+   <title>Contact presence</title>
+   <para>
+      SIP accounts support a feature called "presence". This allow softphone 
users to track other users current status ("on the phone", "ready", "busy" and 
so on). It can be compared to an usual instant messaging online buddy list, but 
is more restricted. Each "buddy" have to be tracked individually and using this 
feature alongside IP2IP or DNS based phone number can consume extra energy, 
reducing notebook battery life. As of 2014, it also prove to be unreliable and 
multiple PBX such as Asterisk only support a subset of the protocol.
+   </para>
+   <para>
+      &sflphone-client-kde; will only track phone numbers if "Enable presence 
support" is checked for an account, that the phone number have already been 
called and if it is either bookmarked or is part of an explicitly tracked 
contact collection.
+   </para>
+   <para>
+      Presence publishing allow some accounts to publish a presence message 
and status (either online or offline) to other softphones. If an account 
support it (and have presence enabled), &sflphone-client-kde; will display a 
widget in the status bar to set the presence message. Some predefined messages 
can be configured in the configuration dialog, but a custom one can also be 
used. The default is "Online". An online presence status doesn't imply that you 
can make a call or that and account is online or not. As &sflphone; also 
support calls over ssh tunnels and localhost addresses, &sflphone; is, in 
theory, always online. Again, empirical testing show this feature does not work 
very well on the vast majority of PBX and registrar. Freeswitch based registrar 
seem to have the best support. This information can also be lost when calls are 
routed though proxies and intermediary PBX.
+   </para>
+   <para>
+      When the presence subscription work as expected, contacts, history calls 
and bookmarked numbers will have either a red or green tint or halo around 
them. This information will also be used to the auto completion engine to give 
better results.
+   </para>
+</sect2>
+
 <sect2 id="basic-use-bookmark-page">
 <title>The Bookmark page</title>
 <para>
@@ -137,6 +153,10 @@ If the contact have multiple phone numbers, a dialog will 
be shown to select the
 </para>
 
 <para>
+Beginning with version 1.4.0, &sflphone-client-kde; can also act as a complete 
contact manager (oriented on phone related features). It is possible to add, 
manage and configure Akonadi collection directly from the configuration dialog 
"Address Book" section. It is also possible to add and remove contacts directly 
from the main interface.
+</para>
+
+<para>
 <screenshot>
 <mediaobject>
 <imageobject>
diff --git a/src/conf/dlgaccountsbase.ui b/src/conf/dlgaccountsbase.ui
index 75122a3..4e60d6f 100644
--- a/src/conf/dlgaccountsbase.ui
+++ b/src/conf/dlgaccountsbase.ui
@@ -855,7 +855,7 @@
                <item>
                 <widget class="LeftToolButton" name="button_audiocodecUp">
                  <property name="toolTip">
-                  <string>Get this account up</string>
+                  <string>Increase codec priority</string>
                  </property>
                  <property name="whatsThis">
                   <string>By default, when you place a call, sflphone will use 
the first account in this list which is &quot;registered&quot;. Change the 
order of the accounts using the &quot;Up&quot; and &quot;Down&quot; 
arrows.</string>
@@ -871,7 +871,7 @@
                <item>
                 <widget class="RightToolButton" name="button_audiocodecDown">
                  <property name="toolTip">
-                  <string>Get this account down</string>
+                  <string>Decrease codec priority</string>
                  </property>
                  <property name="whatsThis">
                   <string>By default, when you place a call, sflphone will use 
the first account in this list which is &quot;registered&quot;. Change the 
order of the accounts using the &quot;Up&quot; and &quot;Down&quot; 
arrows.</string>
@@ -952,6 +952,9 @@
                </property>
                <item>
                 <widget class="LeftToolButton" name="m_pVCodecUpPB">
+                 <property name="toolTip">
+                  <string>Increase codec priority</string>
+                 </property>
                  <property name="text">
                   <string comment="Move video codec up">Up</string>
                  </property>
@@ -959,6 +962,9 @@
                </item>
                <item>
                 <widget class="RightToolButton" name="m_pVCodecDownPB">
+                 <property name="toolTip">
+                  <string>Decrease codec priority</string>
+                 </property>
                  <property name="text">
                   <string comment="Move video codec down">Down</string>
                  </property>
@@ -1174,7 +1180,7 @@
           </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="tab_2">
+        <widget class="QWidget" name="tab_security">
          <attribute name="title">
           <string>Security</string>
          </attribute>
@@ -1724,7 +1730,7 @@
           </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="tab_3">
+        <widget class="QWidget" name="tab_ringtone">
          <attribute name="title">
           <string>Ringtone</string>
          </attribute>

Reply via email to