diff --git a/sflphone-client-kde/CMakeLists.txt b/sflphone-client-kde/CMakeLists.txt
index 15937ac1976fac0c2d5aad0f173bf47c9cf5ddd6..2b41f54214fc01961621d8b916ba31280ab210da 100644
--- a/sflphone-client-kde/CMakeLists.txt
+++ b/sflphone-client-kde/CMakeLists.txt
@@ -2,14 +2,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
PROJECT(sflphone-client-kde)
-SET(LOCAL_CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/")
+SET(LOCAL_CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/")
SET(CMAKE_MODULE_PATH "${LOCAL_CMAKE_MODULE_PATH}")
# --- custom targets: ---
INCLUDE( ${LOCAL_CMAKE_MODULE_PATH}/TargetDistclean.cmake REQUIRED)
FIND_PACKAGE ( Kabc REQUIRED )
-FIND_PACKAGE ( PkgConfig REQUIRED )
+# FIND_PACKAGE ( PkgConfig REQUIRED )
FIND_PACKAGE ( KDE4 REQUIRED )
FIND_PACKAGE ( Qt4 REQUIRED )
@@ -22,173 +22,10 @@ INCLUDE_DIRECTORIES ( ${KDE4_INCLUDES} ${QT_INCLUDES} )
INCLUDE ( ${CMAKE_ROOT}/Modules/CheckIncludeFiles.cmake )
INCLUDE( ${QT_USE_FILE} )
-ADD_DEFINITIONS(${KDE4_DEFINITIONS} ${QT_DEFINITIONS} -fexceptions -DDATA_INSTALL_DIR="\\\"${DATA_INSTALL_DIR}\\\"" )
-
-
-
-#pkg_check_modules(LIBSEXY libsexy>=0.1)
-#pkg_check_modules(KDEPIM kdepimlibs5-dev REQUIRED)
-
-
-
-
-SET(
- sflphone_client_kde_SRCS
- sflphone_kdeview.cpp
- SFLPhone.cpp
- ConfigDialog.cpp
- main.cpp
- sflphone_const.h
- Account.cpp
- AccountList.cpp
- Call.cpp
- CallList.cpp
- configurationmanager_interface_singleton.cpp
- callmanager_interface_singleton.cpp
- instance_interface_singleton.cpp
- AccountWizard.cpp
- AccountItemWidget.cpp
- ActionSetAccountFirst.cpp
- Contact.cpp
- ContactItemWidget.cpp
-)
-
-
-# generate rules for building source files from the resources
-
-SET(QtApp_RCCS resources.qrc)
-
-QT4_ADD_RESOURCES(QtApp_RCC_SRCS ${QtApp_RCCS})
-
-
-# kde4_automoc(${sflphone_client_kde_SRCS})
-
-KDE4_ADD_UI_FILES(sflphone_client_kde_SRCS sflphone_kdeview_base.ui ConfigDialog.ui)
-
-# Build dbus interfaces
-
-# configuration manager interface
-
-SET ( configurationmanager_xml ${CMAKE_CURRENT_SOURCE_DIR}/../sflphone-common/src/dbus/configurationmanager-introspec.xml )
-
-SET_SOURCE_FILES_PROPERTIES(
- ${configurationmanager_xml}
- PROPERTIES
- CLASSNAME ConfigurationManagerInterface
- INCLUDE "metatypes.h")
-
-QT4_ADD_DBUS_INTERFACE(
- sflphone_client_kde_SRCS
- ${configurationmanager_xml}
- configurationmanager_dbus_interface)
-
-# call manager interface
-
-SET ( callmanager_xml ${CMAKE_CURRENT_SOURCE_DIR}/../sflphone-common/src/dbus/callmanager-introspec.xml )
-
-SET_SOURCE_FILES_PROPERTIES(
- ${callmanager_xml}
- PROPERTIES
- CLASSNAME CallManagerInterface
- INCLUDE "metatypes.h")
-
-QT4_ADD_DBUS_INTERFACE(
- sflphone_client_kde_SRCS
- ${callmanager_xml}
- callmanager_dbus_interface)
-
-# instance interface
-
-SET ( instance_xml ${CMAKE_CURRENT_SOURCE_DIR}/../sflphone-common/src/dbus/instance-introspec.xml )
-
-SET_SOURCE_FILES_PROPERTIES(
- ${instance_xml}
- PROPERTIES
- CLASSNAME InstanceInterface
- INCLUDE "metatypes.h")
-
-QT4_ADD_DBUS_INTERFACE(
- sflphone_client_kde_SRCS
- ${instance_xml}
- instance_dbus_interface)
-
-
-# kde4_add_kcfg_files(sflphone_client_kde_SRCS settings.kcfgc )
-
-KDE4_ADD_EXECUTABLE(sflphone-client-kde ${sflphone_client_kde_SRCS} ${QtApp_RCC_SRCS})
-
-SET ( KDE4_KABC_LIBS -lkabc )
-TARGET_LINK_LIBRARIES(sflphone-client-kde ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KABC_LIBS})
-
-
-# ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_CURRENT_BUILD_DIR}/sflphone.1"
-# DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/man/sflphone-client-kde.pod"
-# COMMAND /bin/pod2man
-# ARGS --section=1 --release=${VERSION} --center "" "${CMAKE_CURRENT_SOURCE_DIR}/man/sflphone-client-kde.pod" > "${CMAKE_CURRENT_BUILD_DIR}/sflphone.1"
-# COMMENT "Compiling manpage of sflphone-client-kde with pod2man")
-
-
-
-# ADD_CUSTOM_COMMAND(OUTPUT "sflphone-client-kde.1"
-# # DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/man/sflphone-client-kde.pod"
-# COMMAND /bin/pod2man
-# ARGS --section=1 --release=${VERSION} --center "" "${CMAKE_CURRENT_SOURCE_DIR}/man/sflphone-client-kde.pod" > "${CMAKE_CURRENT_BUILD_DIR}/sflphone-client-kde.1"
-# # COMMENT "Compiling manpage of sflphone-client-kde with pod2man"
-# )
-
-
-# ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_BINARY_DIR}/sflphone-client-kde.1
-# # DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/man/sflphone-client-kde.pod"
-# COMMAND /usr/bin/pod2man
-# ARGS --release=${VERSION} ${CMAKE_CURRENT_SOURCE_DIR}/man/sflphone-client-kde.pod > ${CMAKE_BIANRY_DIR}/sflphone-client-kde.1
-# COMMENT "Compiling manpage of sflphone-client-kde with pod2man"
-# # VERBATIM
-# )
-
-
-# ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BUILD_DIR}/test.txt
-# # DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/man/sflphone-client-kde.pod"
-# COMMAND cp
-# ARGS ${CMAKE_CURRENT_BUILD_DIR}/test2.txt ${CMAKE_CURRENT_BUILD_DIR}/test.txt
-# COMMENT "Yeaaaaaaaaaaaaaahhhhhhh"
-# # VERBATIM
-# )
-
-# ADD_CUSTOM_COMMAND(
-# OUTPUT ${CMAKE_BINARY_DIR}/test.txt
-# COMMAND cp ${CMAKE_BINARY_DIR}/test2.txt ${CMAKE_BINARY_DIR}/test.txt
-# COMMENT "Yeaaaaaaaaaaaaaahhhhhhh"
-# )
-
-# FILE(WRITE "${CMAKE_BINARY_DIR}/sflphone-client-kde.1")
-
-# execute_process(COMMAND pod2man --release=${VERSION} ${CMAKE_CURRENT_SOURCE_DIR}/man/sflphone-client-kde.pod
-# OUTPUT_FILE sflphone-client-kde.1)
-
-# execute_process(COMMAND "cp ${CMAKE_CURRENT_BUILD_DIR}/test2.txt ${CMAKE_CURRENT_BUILD_DIR}/test.txt")
-
+add_subdirectory(src)
add_subdirectory(doc)
add_subdirectory(man)
-
-########### install files ###############
-
-# SET ( HTML_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/doc/kde/HTML )
-#SET ( MANPAGES_INSTALL_DIR /usr/share/man )
-
-INSTALL(TARGETS sflphone-client-kde DESTINATION ${BIN_INSTALL_DIR})
-
-INSTALL( FILES sflphone-client-kde.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-# INSTALL( FILES sflphone_kde.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
-INSTALL( FILES sflphone-client-kdeui.rc DESTINATION ${DATA_INSTALL_DIR}/sflphone-client-kde )
-#INSTALL ( CODE "FILE(MAKE_DIRECTORY ${HTML_INSTALL_DIR}/en/sflphone-client-kde)" )
-#INSTALL( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc/ DESTINATION ${HTML_INSTALL_DIR} )
-# INSTALL( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc/ DESTINATION ${HTML_INSTALL_DIR} )
-#KDE4_CREATE_MANPAGE( ${CMAKE_CURRENT_SOURCE_DIR}/doc/en/sflphone-client-kde/index.docbook INSTALL_DESTINATION ${MAN_INSTALL_DIR} SUBDIR )
-#INSTALL ( CODE "FILE(MAKE_DIRECTORY ${HTML_INSTALL_DIR}/en/sflphone-client-kde)" )
-#INSTALL( FILES ${CMAKE_CURRENT_BUILD_DIR}/sflphone.1 ${CMAKE_CURRENT_SOURCE_DIR}/man/sflphone-client-kde.1 DESTINATION ${MANPAGES_INSTALL_DIR}/man1 )
-# INSTALL( FILES ${CMAKE_BINARY_DIR}/sflphone-client-kde.1 DESTINATION ${MAN_INSTALL_DIR}/man1 )
-# kde4_create_handbook(${CMAKE_CURRENT_SOURCE_DIR}/doc/en/sflphone-client-kde/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
+add_subdirectory(data)
-#INSTALL ( CODE "MESSAGE (\"ton pere\")" )
\ No newline at end of file
diff --git a/sflphone-client-kde/INSTALL b/sflphone-client-kde/INSTALL
new file mode 100644
index 0000000000000000000000000000000000000000..c3ff7117560cc3dfc0ebfcac9372724969446242
--- /dev/null
+++ b/sflphone-client-kde/INSTALL
@@ -0,0 +1,55 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+
+To install the appplication, type the following commands in a console, while in the root directory of this application:
+
+ .config.sh
+ cd build
+ make
+ sudo make install
+
+Explaination
+==================
+
+ .config.sh
+
+This script will configure and prepare the compilation and installation of the program.
+
+All needed files will be built in "build" directory.
+So you have to go to this directory:
+
+ cd build
+
+Then execute the Makefile, to compile the application (src, doc...)
+
+ make
+
+Then install it all using:
+
+ sudo make install
+
+You have to use "sudo" to be able to install the program in a protected directory (which is the case by default and most of the time).
+Therefore it will ask for your system password.
+If you don't have this password or for any reason you want to install the program in a non-protected directory, refer to the Options below.
+
+
+Options
+==================
+
+You can change the prefix of the installation using:
+
+ .config.sh -DCMAKE_INSTALL_PREFIX="expected_prefix_directory"
+
+By default, it is set to /usr.
\ No newline at end of file
diff --git a/sflphone-client-kde/README b/sflphone-client-kde/README
index a5f3a30788f36e571a14ffba50c84111984cb6e0..3db5b30eedc0bcf455d2c3d2a050d077ae5f6c34 100644
--- a/sflphone-client-kde/README
+++ b/sflphone-client-kde/README
@@ -1,15 +1,27 @@
-!!!!!ATTENTION!!!!!
+Welcome to SFLphone KDE Client!
-Before starting the build you may need to setup the KDE4 environment variables.
-To do this open Project->Project Options and then look at the "Run" and the "Make"
-pages. Each of these two has an environment variables widget in which you have
-to fill in the right values for the variables already listed.
+For install instructions, read the INSTALL file, in this directory.
-After setting up the variables you'll also need to run cmake inside the build
-directory. This can not be done by kdevelop as a KDE4 environment is needed
-when running cmake to find KDE4. Open the integrated konsole and change to the build
-subdirectory. Then setup a KDE4 environment and run "cmake ../".
-More information how to setup a KDE4 development environment can be found on
-http://techbase.kde.org/Getting_Started/Increased_Productivity_in_KDE4_with_Scripts
+Copyright (c) Savoir-faire Linux, Inc 2004-2009
+ <sflphoneteam@savoirfairelinux.com>
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+Refer to the development site for further information: http://dev.savoirfairelinux.net/sflphone
+
+
+Thank you
diff --git a/sflphone-client-kde/cmake_modules/FindKabc.cmake b/sflphone-client-kde/cmake/FindKabc.cmake
similarity index 100%
rename from sflphone-client-kde/cmake_modules/FindKabc.cmake
rename to sflphone-client-kde/cmake/FindKabc.cmake
diff --git a/sflphone-client-kde/cmake_modules/FindQt4.cmake b/sflphone-client-kde/cmake/FindQt4.cmake
similarity index 100%
rename from sflphone-client-kde/cmake_modules/FindQt4.cmake
rename to sflphone-client-kde/cmake/FindQt4.cmake
diff --git a/sflphone-client-kde/cmake/TargetDistclean.cmake b/sflphone-client-kde/cmake/TargetDistclean.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..8fdf46feeeec3fdd99189acb1086128a6afe28c2
--- /dev/null
+++ b/sflphone-client-kde/cmake/TargetDistclean.cmake
@@ -0,0 +1,81 @@
+
+# add custom target distclean
+# cleans and removes cmake generated files etc.
+# Jan Woetzel 04/2003
+#
+
+IF (UNIX)
+ ADD_CUSTOM_TARGET (distclean @echo cleaning for source distribution)
+ SET(DISTCLEANED
+# cmake.depends
+# cmake.check_depends
+# CMakeCache.txt
+# cmake.check_cache
+# *.cmake
+# Makefile
+# core core.*
+# gmon.out
+# *~
+# *_automoc.cpp.files
+# *_automoc.cpp
+# moc_*.cpp
+# ui_*.h
+# *.moc
+# qrc_resources.cxx
+# *_dbus_interface.cpp
+# *_dbus_interface.h
+# sflphone-client-kde
+# sflphone-client-kde.shell
+# install_manifest.txt
+# *.1
+ CMakeCache.txt
+ *.cmake
+ Makefile
+ CMakeFiles
+ CMakeTmp
+ install_manifest.txt
+ man/*.cmake
+ man/Makefile
+ man/CMakeFiles
+ man/*.html
+ man/*.1
+ doc/*.cmake
+ doc/Makefile
+ doc/CMakeFiles
+ doc/*.bz2
+ data/*.cmake
+ data/Makefile
+ data/CMakeFiles
+ src/*.cmake
+ src/Makefile
+ src/CMakeFiles
+ src/*.o
+ src/moc_*.cpp
+ src/ui_*.h
+ src/qrc_*.cxx
+ src/*_dbus_interface.cpp
+ src/*_dbus_interface.h
+ src/*_automoc.cpp.files
+ src/*_automoc.cpp
+ src/sflphone-client-kde
+ src/sflphone-client-kde.shell
+ )
+
+ SET(DISTCLEANED_REC
+ *.cmake
+ Makefile
+ CMakeFiles
+ )
+
+ ADD_CUSTOM_COMMAND(
+ DEPENDS clean
+ COMMENT "distribution clean"
+ COMMAND rm
+ ARGS -Rf CMakeTmp CMakeFiles ${DISTCLEANED}
+# COMMAND find
+# ARGS ". \( -name 'Makefile' -o -name 'CMakeFiles' \) -exec rm -rf {} \;"
+ TARGET distclean
+ )
+ENDIF(UNIX)
+
+
diff --git a/sflphone-client-kde/cmake_modules/TargetDistclean.cmake b/sflphone-client-kde/cmake_modules/TargetDistclean.cmake
deleted file mode 100644
index ace5efc5dcdea0f0e30e8c38e11e4c15f1e4523e..0000000000000000000000000000000000000000
--- a/sflphone-client-kde/cmake_modules/TargetDistclean.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
-
-# add custom target distclean
-# cleans and removes cmake generated files etc.
-# Jan Woetzel 04/2003
-#
-
-IF (UNIX)
- ADD_CUSTOM_TARGET (distclean @echo cleaning for source distribution)
- SET(DISTCLEANED
- cmake.depends
- cmake.check_depends
- CMakeCache.txt
- cmake.check_cache
- *.cmake
- Makefile
- core core.*
- gmon.out
- *~
- *_automoc.cpp.files
- *_automoc.cpp
- moc_*.cpp
- ui_*.h
- *.moc
- qrc_resources.cxx
- *_dbus_interface.cpp
- *_dbus_interface.h
- sflphone-client-kde
- sflphone-client-kde.shell
- install_manifest.txt
- *.1
- man/*.cmake
- man/Makefile
- man/CMakeFiles
- man/*.html
- man/*.1
- doc/*.cmake
- doc/Makefile
- doc/CMakeFiles
- doc/*.bz2
- )
-
- ADD_CUSTOM_COMMAND(
- DEPENDS clean
- COMMENT "distribution clean"
- COMMAND rm
- ARGS -Rf CMakeTmp CMakeFiles ${DISTCLEANED}
- TARGET distclean
- )
-ENDIF(UNIX)
-
-
diff --git a/sflphone-client-kde/config.sh b/sflphone-client-kde/config.sh
new file mode 100755
index 0000000000000000000000000000000000000000..931c28bc5e15f6222cbceb638bcdbc6357ca29ac
--- /dev/null
+++ b/sflphone-client-kde/config.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+function autocmd()
+{
+ echo "Running ${1}..."
+ $* || {
+ echo "Error running ${1}"
+ exit 1
+ }
+}
+
+if [ ! -d "build" ]; then
+ mkdir build
+fi
+
+cd build
+
+autocmd cmake $@ ..
+
+echo $@
+
+echo "**********************************************"
+echo "Configuration done!"
+echo "Run \`cd build\' to go to the build directory."
+echo "Then run \`make\'to build the software."
+echo "**********************************************"
diff --git a/sflphone-client-kde/data/CMakeLists.txt b/sflphone-client-kde/data/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c7fb198d7e1bface2b84ab5c33074c2bf52a3af3
--- /dev/null
+++ b/sflphone-client-kde/data/CMakeLists.txt
@@ -0,0 +1,4 @@
+
+INSTALL( FILES sflphone-client-kde.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+INSTALL( FILES sflphone-client-kdeui.rc DESTINATION ${DATA_INSTALL_DIR}/sflphone-client-kde )
+
diff --git a/sflphone-client-kde/sflphone-client-kde.desktop b/sflphone-client-kde/data/sflphone-client-kde.desktop
similarity index 100%
rename from sflphone-client-kde/sflphone-client-kde.desktop
rename to sflphone-client-kde/data/sflphone-client-kde.desktop
diff --git a/sflphone-client-kde/sflphone-client-kdeui.rc b/sflphone-client-kde/data/sflphone-client-kdeui.rc
similarity index 100%
rename from sflphone-client-kde/sflphone-client-kdeui.rc
rename to sflphone-client-kde/data/sflphone-client-kdeui.rc
diff --git a/sflphone-client-kde/doc/CMakeLists.txt b/sflphone-client-kde/doc/CMakeLists.txt
index 0df9c9adac43df3a227847bff1b026bfdc98b118..9c366d939ca52853864cfe0fe473c26f17383f22 100644
--- a/sflphone-client-kde/doc/CMakeLists.txt
+++ b/sflphone-client-kde/doc/CMakeLists.txt
@@ -1,4 +1,5 @@
########### install files ###############
#
#
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
+
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR sflphone-client-kde)
diff --git a/sflphone-client-kde/install.sh b/sflphone-client-kde/install.sh
deleted file mode 100755
index 651e29b308a721984267bd55efa20f9ad7b63695..0000000000000000000000000000000000000000
--- a/sflphone-client-kde/install.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-echo "Installing SflPhone-KDE"
-echo "Creating build directory"
-mkdir build
-cd build
-echo "Executing cmake command"
-cmake ../
-echo "Executing makefile"
-make
-echo "Compile done. You may now execute build/sflphone_kde ."
\ No newline at end of file
diff --git a/sflphone-client-kde/po/sflphone-client-kde.pot b/sflphone-client-kde/po/sflphone-client-kde.pot
new file mode 100644
index 0000000000000000000000000000000000000000..0af5848a3410ca3cd5fb9146321509228ba4d4c9
--- /dev/null
+++ b/sflphone-client-kde/po/sflphone-client-kde.pot
@@ -0,0 +1,225 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-05 12:00-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: AccountWizard.cpp:163
+msgid "Account Wizard"
+msgstr ""
+
+#: AccountWizard.cpp:198
+msgid "Creation of account succeed with parameters :\n"
+msgstr ""
+
+#: AccountWizard.cpp:209
+msgid "Creation of account has failed for the reason :\n"
+msgstr ""
+
+#: AccountWizard.cpp:215
+msgid "Register of account succeed with parameters :\n"
+msgstr ""
+
+#: AccountWizard.cpp:251
+msgid "Alias : "
+msgstr ""
+
+#: AccountWizard.cpp:252
+msgid "Server : "
+msgstr ""
+
+#: AccountWizard.cpp:253
+msgid "User : "
+msgstr ""
+
+#: AccountWizard.cpp:254
+msgid "Password : "
+msgstr ""
+
+#: AccountWizard.cpp:255
+msgid "Protocol : "
+msgstr ""
+
+#: AccountWizard.cpp:256
+msgid "Mailbox : "
+msgstr ""
+
+#: AccountWizard.cpp:273
+msgid "Account Creation Wizard"
+msgstr ""
+
+#: AccountWizard.cpp:274
+msgid "Welcome to the Account creation wizard of SFLPhone"
+msgstr ""
+
+#: AccountWizard.cpp:276
+msgid "This wizard will help you setting up an account."
+msgstr ""
+
+#: AccountWizard.cpp:304
+msgid "Accounts"
+msgstr ""
+
+#: AccountWizard.cpp:305
+msgid "Please choose between those options :"
+msgstr ""
+
+#: AccountWizard.cpp:307
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr ""
+
+#: AccountWizard.cpp:308
+msgid "Register an existing SIP/IAX2 account"
+msgstr ""
+
+#: AccountWizard.cpp:347
+msgid "VoIP Protocols"
+msgstr ""
+
+#: AccountWizard.cpp:348
+msgid "Choose the account type :"
+msgstr ""
+
+#: AccountWizard.cpp:350
+msgid "Create a SIP (Session Initiation Protocol) account"
+msgstr ""
+
+#: AccountWizard.cpp:351
+msgid "Create a IAX2 (InterAsterisk eXchange) account"
+msgstr ""
+
+#: AccountWizard.cpp:390
+msgid "Optionnal Email Address"
+msgstr ""
+
+#: AccountWizard.cpp:391
+msgid "This email address will be used to send your voicemail messages."
+msgstr ""
+
+#: AccountWizard.cpp:393
+msgid "Email address"
+msgstr ""
+
+#: AccountWizard.cpp:427
+msgid "SIP Account Settings"
+msgstr ""
+
+#: AccountWizard.cpp:431
+msgid "IAX2 Account Settings"
+msgstr ""
+
+#: AccountWizard.cpp:433
+msgid "Please full these settings fields."
+msgstr ""
+
+#: AccountWizard.cpp:435
+msgid "Alias *"
+msgstr ""
+
+#: AccountWizard.cpp:436
+msgid "Server *"
+msgstr ""
+
+#: AccountWizard.cpp:437
+msgid "User *"
+msgstr ""
+
+#: AccountWizard.cpp:438
+msgid "Password *"
+msgstr ""
+
+#: AccountWizard.cpp:510
+msgid "Network Address Translation (NAT)"
+msgstr ""
+
+#: AccountWizard.cpp:511
+msgid ""
+"You should probably enable this option if you're placed under a firewall :"
+msgstr ""
+
+#: AccountWizard.cpp:513
+msgid "Enable STUN"
+msgstr ""
+
+#: AccountWizard.cpp:514
+msgid "Stun Server"
+msgstr ""
+
+#: AccountWizard.cpp:548
+msgid "Account Definition Finished"
+msgstr ""
+
+#: AccountWizard.cpp:549
+msgid ""
+"After checking the settings you chose, click \"Finish\" to create the "
+"account."
+msgstr ""
+
+#: Call.cpp:96
+msgid "Transfer to : "
+msgstr ""
+
+#: SFLPhone.cpp:109
+msgid "You still have some calls open. Please close all calls before quitting."
+msgstr ""
+
+#: sflphone_kdeview.cpp:984 sflphone_kdeview.cpp:1040
+msgid "Edit before call"
+msgstr ""
+
+#: sflphone_const.h:51
+msgctxt "ton pere"
+msgid "Call"
+msgstr ""
+
+#: sflphone_const.h:52
+msgid "Hang up"
+msgstr ""
+
+#: sflphone_const.h:53
+msgid "Hold"
+msgstr ""
+
+#: sflphone_const.h:54
+msgid "Transfer"
+msgstr ""
+
+#: sflphone_const.h:55
+msgid "Record"
+msgstr ""
+
+#: sflphone_const.h:56
+msgid "Accept"
+msgstr ""
+
+#: sflphone_const.h:57
+msgid "Refuse"
+msgstr ""
+
+#: sflphone_const.h:58
+msgid "Unhold"
+msgstr ""
+
+#: sflphone_const.h:59
+msgid "Give up transfer"
+msgstr ""
+
+#: sflphone_const.h:60
+msgid "Call back"
+msgstr ""
+
+#: sflphone_const.h:61
+msgid "Give up search"
+msgstr ""
diff --git a/sflphone-client-kde/po/sflphone-client-kde_fr.po b/sflphone-client-kde/po/sflphone-client-kde_fr.po
new file mode 100644
index 0000000000000000000000000000000000000000..c02b586ab118e99401b9435e5353c0a5a31fa3fc
--- /dev/null
+++ b/sflphone-client-kde/po/sflphone-client-kde_fr.po
@@ -0,0 +1,225 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-05 12:00-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: AccountWizard.cpp:163
+msgid "Account Wizard"
+msgstr "Assistant de création de compte"
+
+#: AccountWizard.cpp:198
+msgid "Creation of account succeed with parameters :\n"
+msgstr "Compte créé avec succès avec les paramètres :\n"
+
+#: AccountWizard.cpp:209
+msgid "Creation of account has failed for the reason :\n"
+msgstr "Création de compte échouée pour raison :\n"
+
+#: AccountWizard.cpp:215
+msgid "Register of account succeed with parameters :\n"
+msgstr "Compte enregistré avec succès avec les paramètres :\n"
+
+#: AccountWizard.cpp:251
+msgid "Alias : "
+msgstr "Alias : "
+
+#: AccountWizard.cpp:252
+msgid "Server : "
+msgstr "Serveur : "
+
+#: AccountWizard.cpp:253
+msgid "User : "
+msgstr "Utilisateur : "
+
+#: AccountWizard.cpp:254
+msgid "Password : "
+msgstr "Mot de passe : "
+
+#: AccountWizard.cpp:255
+msgid "Protocol : "
+msgstr "Protocole : "
+
+#: AccountWizard.cpp:256
+msgid "Mailbox : "
+msgstr "Boîte vocale : "
+
+#: AccountWizard.cpp:273
+msgid "Account Creation Wizard"
+msgstr "Assistant de création de compte"
+
+#: AccountWizard.cpp:274
+msgid "Welcome to the Account creation wizard of SFLPhone"
+msgstr "Bienvenue dans l'assistant de création de compte de SFLPhone"
+
+#: AccountWizard.cpp:276
+msgid "This wizard will help you setting up an account."
+msgstr "Cet assistant va vous aider à créer et paramètrer un compte"
+
+#: AccountWizard.cpp:304
+msgid "Accounts"
+msgstr "Comptes"
+
+#: AccountWizard.cpp:305
+msgid "Please choose between those options :"
+msgstr "Choisissez une des options :"
+
+#: AccountWizard.cpp:307
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "Créer un compte gratuit SIP/IAX2 sur sflphone.org"
+
+#: AccountWizard.cpp:308
+msgid "Register an existing SIP/IAX2 account"
+msgstr "Enregistrer un compte SIP/IAX2 existant"
+
+#: AccountWizard.cpp:347
+msgid "VoIP Protocols"
+msgstr "Protocoles VoIP"
+
+#: AccountWizard.cpp:348
+msgid "Choose the account type :"
+msgstr "Choisissez le type de compte :"
+
+#: AccountWizard.cpp:350
+msgid "Create a SIP (Session Initiation Protocol) account"
+msgstr "Créer un compte SIP (Session Initiation Protocol)"
+
+#: AccountWizard.cpp:351
+msgid "Create a IAX2 (InterAsterisk eXchange) account"
+msgstr "Créer un compte IAX2 (InterAsterisk eXchange)"
+
+#: AccountWizard.cpp:390
+msgid "Optionnal Email Address"
+msgstr "Adresse email (optionnel)"
+
+#: AccountWizard.cpp:391
+msgid "This email address will be used to send your voicemail messages."
+msgstr "Cette adresse email sera utilisée pour l'envoi des messages vocaux et textes"
+
+#: AccountWizard.cpp:393
+msgid "Email address"
+msgstr ""
+
+#: AccountWizard.cpp:427
+msgid "SIP Account Settings"
+msgstr ""
+
+#: AccountWizard.cpp:431
+msgid "IAX2 Account Settings"
+msgstr ""
+
+#: AccountWizard.cpp:433
+msgid "Please full these settings fields."
+msgstr ""
+
+#: AccountWizard.cpp:435
+msgid "Alias *"
+msgstr ""
+
+#: AccountWizard.cpp:436
+msgid "Server *"
+msgstr ""
+
+#: AccountWizard.cpp:437
+msgid "User *"
+msgstr ""
+
+#: AccountWizard.cpp:438
+msgid "Password *"
+msgstr ""
+
+#: AccountWizard.cpp:510
+msgid "Network Address Translation (NAT)"
+msgstr ""
+
+#: AccountWizard.cpp:511
+msgid ""
+"You should probably enable this option if you're placed under a firewall :"
+msgstr ""
+
+#: AccountWizard.cpp:513
+msgid "Enable STUN"
+msgstr ""
+
+#: AccountWizard.cpp:514
+msgid "Stun Server"
+msgstr ""
+
+#: AccountWizard.cpp:548
+msgid "Account Definition Finished"
+msgstr ""
+
+#: AccountWizard.cpp:549
+msgid ""
+"After checking the settings you chose, click \"Finish\" to create the "
+"account."
+msgstr ""
+
+#: Call.cpp:96
+msgid "Transfer to : "
+msgstr ""
+
+#: SFLPhone.cpp:109
+msgid "You still have some calls open. Please close all calls before quitting."
+msgstr ""
+
+#: sflphone_kdeview.cpp:984 sflphone_kdeview.cpp:1040
+msgid "Edit before call"
+msgstr ""
+
+#: sflphone_const.h:51
+msgctxt "ton pere"
+msgid "Call"
+msgstr ""
+
+#: sflphone_const.h:52
+msgid "Hang up"
+msgstr ""
+
+#: sflphone_const.h:53
+msgid "Hold"
+msgstr ""
+
+#: sflphone_const.h:54
+msgid "Transfer"
+msgstr ""
+
+#: sflphone_const.h:55
+msgid "Record"
+msgstr ""
+
+#: sflphone_const.h:56
+msgid "Accept"
+msgstr ""
+
+#: sflphone_const.h:57
+msgid "Refuse"
+msgstr ""
+
+#: sflphone_const.h:58
+msgid "Unhold"
+msgstr ""
+
+#: sflphone_const.h:59
+msgid "Give up transfer"
+msgstr ""
+
+#: sflphone_const.h:60
+msgid "Call back"
+msgstr ""
+
+#: sflphone_const.h:61
+msgid "Give up search"
+msgstr ""
diff --git a/sflphone-client-kde/resources.qrc b/sflphone-client-kde/resources.qrc
deleted file mode 100644
index b084c4d83acbb8d4dcdb848c17f471b9c441dd21..0000000000000000000000000000000000000000
--- a/sflphone-client-kde/resources.qrc
+++ /dev/null
@@ -1,92 +0,0 @@
-<RCC>
- <qresource prefix="images" >
- <file>icons/sflphone.svg</file>
- <file>icons/sflphone_notif.svg</file>
- <file>icons/application-exit.png</file>
- <file>icons/office-address-book.png</file>
- <file>icons/x-office-address-book.png</file>
- <file>icons/add.png</file>
- <file>icons/remove.png</file>
- <file>icons/del_off.png</file>
- <file>icons/del_on.png</file>
- <file>icons/accept.svg</file>
- <file>icons/busy.svg</file>
- <file>icons/call.svg</file>
- <file>icons/current.svg</file>
- <file>icons/dial.svg</file>
- <file>icons/fail.svg</file>
- <file>icons/hang_up.svg</file>
- <file>icons/history2.svg</file>
- <file>icons/history.svg</file>
- <file>icons/hold.svg</file>
- <file>icons/application-exit.png</file>
- <file>icons/icon_accept.svg</file>
- <file>icons/icon_call.svg</file>
- <file>icons/icon_dialpad_off.svg</file>
- <file>icons/icon_dialpad.svg</file>
- <file>icons/icon_hangup.svg</file>
- <file>icons/icon_hold.svg</file>
- <file>icons/icon_rec.svg</file>
- <file>icons/icon_unhold.svg</file>
- <file>icons/icon_volume_off.svg</file>
- <file>icons/icon_volume.svg</file>
- <file>icons/incoming.svg</file>
- <file>icons/mailbox.svg</file>
- <file>icons/mic_25.svg</file>
- <file>icons/mic_50.svg</file>
- <file>icons/mic_75.svg</file>
- <file>icons/mic.svg</file>
- <file>icons/missed.svg</file>
- <file>icons/outgoing.svg</file>
- <file>icons/rec_call.svg</file>
- <file>icons/refuse.svg</file>
- <file>icons/ring.svg</file>
- <file>icons/sflphone.png</file>
- <file>icons/speaker_25.svg</file>
- <file>icons/speaker_50.svg</file>
- <file>icons/speaker_75.svg</file>
- <file>icons/speaker.svg</file>
- <file>icons/stock_person.svg</file>
- <file>icons/transfert.svg</file>
- <file>icons/unhold.svg</file>
- <file>icons/accept.svg</file>
- <file>icons/busy.svg</file>
- <file>icons/call.svg</file>
- <file>icons/current.svg</file>
- <file>icons/dial.svg</file>
- <file>icons/fail.svg</file>
- <file>icons/hang_up.svg</file>
- <file>icons/history2.svg</file>
- <file>icons/history.svg</file>
- <file>icons/hold.svg</file>
- <file>icons/icon_accept.svg</file>
- <file>icons/icon_call.svg</file>
- <file>icons/icon_dialpad_off.svg</file>
- <file>icons/icon_dialpad.svg</file>
- <file>icons/icon_hangup.svg</file>
- <file>icons/icon_hold.svg</file>
- <file>icons/icon_rec.svg</file>
- <file>icons/icon_unhold.svg</file>
- <file>icons/icon_volume_off.svg</file>
- <file>icons/icon_volume.svg</file>
- <file>icons/incoming.svg</file>
- <file>icons/mailbox.svg</file>
- <file>icons/mic_25.svg</file>
- <file>icons/mic_50.svg</file>
- <file>icons/mic_75.svg</file>
- <file>icons/mic.svg</file>
- <file>icons/missed.svg</file>
- <file>icons/outgoing.svg</file>
- <file>icons/rec_call.svg</file>
- <file>icons/refuse.svg</file>
- <file>icons/ring.svg</file>
- <file>icons/sflphone.png</file>
- <file>icons/speaker_25.svg</file>
- <file>icons/speaker_50.svg</file>
- <file>icons/speaker_75.svg</file>
- <file>icons/speaker.svg</file>
- <file>icons/stock_person.svg</file>
- <file>icons/transfert.svg</file>
- <file>icons/unhold.svg</file>
- </qresource>
-</RCC>
diff --git a/sflphone-client-kde/Account.cpp b/sflphone-client-kde/src/Account.cpp
similarity index 100%
rename from sflphone-client-kde/Account.cpp
rename to sflphone-client-kde/src/Account.cpp
diff --git a/sflphone-client-kde/Account.h b/sflphone-client-kde/src/Account.h
similarity index 97%
rename from sflphone-client-kde/Account.h
rename to sflphone-client-kde/src/Account.h
index 78175ff3411673059c971ebaeaa6362b5f239724..a31c9a2ba671a0157803cf9a8ece86f244852e8c 100644
--- a/sflphone-client-kde/Account.h
+++ b/sflphone-client-kde/src/Account.h
@@ -26,9 +26,11 @@
#include <QtGui/QListWidgetItem>
#include <QtGui/QColor>
-#include "metatypes.h"
+// #include "metatypes.h"
#include "AccountItemWidget.h"
+typedef QMap<QString, QString> MapStringString;
+
const QString account_state_name(QString & s);
class Account{
diff --git a/sflphone-client-kde/AccountItemWidget.cpp b/sflphone-client-kde/src/AccountItemWidget.cpp
similarity index 100%
rename from sflphone-client-kde/AccountItemWidget.cpp
rename to sflphone-client-kde/src/AccountItemWidget.cpp
diff --git a/sflphone-client-kde/AccountItemWidget.h b/sflphone-client-kde/src/AccountItemWidget.h
similarity index 100%
rename from sflphone-client-kde/AccountItemWidget.h
rename to sflphone-client-kde/src/AccountItemWidget.h
diff --git a/sflphone-client-kde/AccountList.cpp b/sflphone-client-kde/src/AccountList.cpp
similarity index 100%
rename from sflphone-client-kde/AccountList.cpp
rename to sflphone-client-kde/src/AccountList.cpp
diff --git a/sflphone-client-kde/AccountList.h b/sflphone-client-kde/src/AccountList.h
similarity index 100%
rename from sflphone-client-kde/AccountList.h
rename to sflphone-client-kde/src/AccountList.h
diff --git a/sflphone-client-kde/AccountWizard.cpp b/sflphone-client-kde/src/AccountWizard.cpp
similarity index 100%
rename from sflphone-client-kde/AccountWizard.cpp
rename to sflphone-client-kde/src/AccountWizard.cpp
diff --git a/sflphone-client-kde/AccountWizard.h b/sflphone-client-kde/src/AccountWizard.h
similarity index 100%
rename from sflphone-client-kde/AccountWizard.h
rename to sflphone-client-kde/src/AccountWizard.h
diff --git a/sflphone-client-kde/ActionSetAccountFirst.cpp b/sflphone-client-kde/src/ActionSetAccountFirst.cpp
similarity index 100%
rename from sflphone-client-kde/ActionSetAccountFirst.cpp
rename to sflphone-client-kde/src/ActionSetAccountFirst.cpp
diff --git a/sflphone-client-kde/ActionSetAccountFirst.h b/sflphone-client-kde/src/ActionSetAccountFirst.h
similarity index 100%
rename from sflphone-client-kde/ActionSetAccountFirst.h
rename to sflphone-client-kde/src/ActionSetAccountFirst.h
diff --git a/sflphone-client-kde/src/CMakeLists.txt b/sflphone-client-kde/src/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5762b2bb0708d223b02ad9978ea62cca129e25da
--- /dev/null
+++ b/sflphone-client-kde/src/CMakeLists.txt
@@ -0,0 +1,96 @@
+
+ADD_DEFINITIONS(${KDE4_DEFINITIONS} ${QT_DEFINITIONS} -fexceptions -DDATA_INSTALL_DIR="\\\"${DATA_INSTALL_DIR}\\\"" )
+
+SET ( KDE4_KABC_LIBS -lkabc )
+
+
+
+
+
+SET(
+ sflphone_client_kde_SRCS
+ sflphone_kdeview.cpp
+ SFLPhone.cpp
+ ConfigDialog.cpp
+ main.cpp
+ sflphone_const.h
+ Account.cpp
+ AccountList.cpp
+ Call.cpp
+ CallList.cpp
+ configurationmanager_interface_singleton.cpp
+ callmanager_interface_singleton.cpp
+ instance_interface_singleton.cpp
+ AccountWizard.cpp
+ AccountItemWidget.cpp
+ ActionSetAccountFirst.cpp
+ Contact.cpp
+ ContactItemWidget.cpp
+)
+
+
+# generate rules for building source files from the resources
+SET(QtApp_RCCS qrc/resources.qrc)
+QT4_ADD_RESOURCES(QtApp_RCC_SRCS ${QtApp_RCCS})
+
+
+# Build dbus interfaces
+SET ( dbus_xml_introspecs_path ${CMAKE_CURRENT_SOURCE_DIR}/../../sflphone-common/src/dbus/)
+
+# configuration manager interface
+SET ( configurationmanager_xml ${dbus_xml_introspecs_path}/configurationmanager-introspec.xml )
+
+SET_SOURCE_FILES_PROPERTIES(
+ ${configurationmanager_xml}
+ PROPERTIES
+ CLASSNAME ConfigurationManagerInterface
+ INCLUDE "dbus/metatypes.h")
+
+QT4_ADD_DBUS_INTERFACE(
+ sflphone_client_kde_SRCS
+ ${configurationmanager_xml}
+ configurationmanager_dbus_interface)
+
+# call manager interface
+SET ( callmanager_xml ${dbus_xml_introspecs_path}/callmanager-introspec.xml )
+
+SET_SOURCE_FILES_PROPERTIES(
+ ${callmanager_xml}
+ PROPERTIES
+ CLASSNAME CallManagerInterface
+ INCLUDE "dbus/metatypes.h")
+
+QT4_ADD_DBUS_INTERFACE(
+ sflphone_client_kde_SRCS
+ ${callmanager_xml}
+ callmanager_dbus_interface)
+
+# instance interface
+SET ( instance_xml ${dbus_xml_introspecs_path}/instance-introspec.xml )
+
+SET_SOURCE_FILES_PROPERTIES(
+ ${instance_xml}
+ PROPERTIES
+ CLASSNAME InstanceInterface
+ INCLUDE "dbus/metatypes.h")
+
+QT4_ADD_DBUS_INTERFACE(
+ sflphone_client_kde_SRCS
+ ${instance_xml}
+ instance_dbus_interface)
+
+
+# kde4_automoc(${sflphone_client_kde_SRCS})
+
+KDE4_ADD_UI_FILES(sflphone_client_kde_SRCS ui/sflphone_kdeview_base.ui ui/ConfigDialog.ui)
+
+KDE4_ADD_EXECUTABLE(sflphone-client-kde ${sflphone_client_kde_SRCS} ${QtApp_RCC_SRCS})
+
+TARGET_LINK_LIBRARIES(sflphone-client-kde ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KABC_LIBS})
+
+
+########### install files ###############
+
+INSTALL(TARGETS sflphone-client-kde DESTINATION ${BIN_INSTALL_DIR})
+
+
diff --git a/sflphone-client-kde/Call.cpp b/sflphone-client-kde/src/Call.cpp
similarity index 100%
rename from sflphone-client-kde/Call.cpp
rename to sflphone-client-kde/src/Call.cpp
diff --git a/sflphone-client-kde/Call.h b/sflphone-client-kde/src/Call.h
similarity index 100%
rename from sflphone-client-kde/Call.h
rename to sflphone-client-kde/src/Call.h
diff --git a/sflphone-client-kde/CallList.cpp b/sflphone-client-kde/src/CallList.cpp
similarity index 100%
rename from sflphone-client-kde/CallList.cpp
rename to sflphone-client-kde/src/CallList.cpp
diff --git a/sflphone-client-kde/CallList.h b/sflphone-client-kde/src/CallList.h
similarity index 100%
rename from sflphone-client-kde/CallList.h
rename to sflphone-client-kde/src/CallList.h
diff --git a/sflphone-client-kde/ConfigDialog.cpp b/sflphone-client-kde/src/ConfigDialog.cpp
similarity index 99%
rename from sflphone-client-kde/ConfigDialog.cpp
rename to sflphone-client-kde/src/ConfigDialog.cpp
index 4f9d9a5391dd641174db077ce93726a678a2c2e0..2e340c73fdc4e35bdffc9ca0d2e2b7534deefaca 100644
--- a/sflphone-client-kde/ConfigDialog.cpp
+++ b/sflphone-client-kde/src/ConfigDialog.cpp
@@ -30,9 +30,11 @@
#include "sflphone_const.h"
-#include "metatypes.h"
+// #include "metatypes.h"
#include "configurationmanager_interface_singleton.h"
+typedef QMap<QString, QString> MapStringString;
+typedef QMap<QString, int> MapStringInt;
AccountList * ConfigurationDialog::accountList;
diff --git a/sflphone-client-kde/ConfigDialog.h b/sflphone-client-kde/src/ConfigDialog.h
similarity index 100%
rename from sflphone-client-kde/ConfigDialog.h
rename to sflphone-client-kde/src/ConfigDialog.h
diff --git a/sflphone-client-kde/Contact.cpp b/sflphone-client-kde/src/Contact.cpp
similarity index 100%
rename from sflphone-client-kde/Contact.cpp
rename to sflphone-client-kde/src/Contact.cpp
diff --git a/sflphone-client-kde/Contact.h b/sflphone-client-kde/src/Contact.h
similarity index 100%
rename from sflphone-client-kde/Contact.h
rename to sflphone-client-kde/src/Contact.h
diff --git a/sflphone-client-kde/ContactItemWidget.cpp b/sflphone-client-kde/src/ContactItemWidget.cpp
similarity index 99%
rename from sflphone-client-kde/ContactItemWidget.cpp
rename to sflphone-client-kde/src/ContactItemWidget.cpp
index 470cf324ad02919a06cd141da521d67ab1c6fc53..f32614c58dc753e3053516d5ec5755ba45cade85 100644
--- a/sflphone-client-kde/ContactItemWidget.cpp
+++ b/sflphone-client-kde/src/ContactItemWidget.cpp
@@ -90,7 +90,7 @@ ContactItemWidget::~ContactItemWidget()
{
delete contactName;
delete contactNumber;
- delete contactPhoto;
+// delete contactPhoto;
delete contactType;
}
diff --git a/sflphone-client-kde/ContactItemWidget.h b/sflphone-client-kde/src/ContactItemWidget.h
similarity index 100%
rename from sflphone-client-kde/ContactItemWidget.h
rename to sflphone-client-kde/src/ContactItemWidget.h
diff --git a/sflphone-client-kde/SFLPhone.cpp b/sflphone-client-kde/src/SFLPhone.cpp
similarity index 100%
rename from sflphone-client-kde/SFLPhone.cpp
rename to sflphone-client-kde/src/SFLPhone.cpp
diff --git a/sflphone-client-kde/SFLPhone.h b/sflphone-client-kde/src/SFLPhone.h
similarity index 100%
rename from sflphone-client-kde/SFLPhone.h
rename to sflphone-client-kde/src/SFLPhone.h
diff --git a/sflphone-client-kde/callmanager_interface_singleton.cpp b/sflphone-client-kde/src/callmanager_interface_singleton.cpp
similarity index 100%
rename from sflphone-client-kde/callmanager_interface_singleton.cpp
rename to sflphone-client-kde/src/callmanager_interface_singleton.cpp
diff --git a/sflphone-client-kde/callmanager_interface_singleton.h b/sflphone-client-kde/src/callmanager_interface_singleton.h
similarity index 100%
rename from sflphone-client-kde/callmanager_interface_singleton.h
rename to sflphone-client-kde/src/callmanager_interface_singleton.h
diff --git a/sflphone-client-kde/configurationmanager_interface_singleton.cpp b/sflphone-client-kde/src/configurationmanager_interface_singleton.cpp
similarity index 100%
rename from sflphone-client-kde/configurationmanager_interface_singleton.cpp
rename to sflphone-client-kde/src/configurationmanager_interface_singleton.cpp
diff --git a/sflphone-client-kde/configurationmanager_interface_singleton.h b/sflphone-client-kde/src/configurationmanager_interface_singleton.h
similarity index 100%
rename from sflphone-client-kde/configurationmanager_interface_singleton.h
rename to sflphone-client-kde/src/configurationmanager_interface_singleton.h
diff --git a/sflphone-client-kde/src/dbus/CMakeLists.txt b/sflphone-client-kde/src/dbus/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..928a6f963043f8275a557c19ad243e68165f5c5d
--- /dev/null
+++ b/sflphone-client-kde/src/dbus/CMakeLists.txt
@@ -0,0 +1,48 @@
+
+MESSAGE("Yeeeeaaaaah : rentre dans dbus!!!!!")
+# Build dbus interfaces
+
+# configuration manager interface
+
+SET ( configurationmanager_xml ${CMAKE_CURRENT_SOURCE_DIR}/../sflphone-common/src/dbus/configurationmanager-introspec.xml )
+
+SET_SOURCE_FILES_PROPERTIES(
+ ${configurationmanager_xml}
+ PROPERTIES
+ CLASSNAME ConfigurationManagerInterface
+ INCLUDE "metatypes.h")
+
+QT4_ADD_DBUS_INTERFACE(
+ sflphone_client_kde_SRCS
+ ${configurationmanager_xml}
+ configurationmanager_dbus_interface)
+
+# call manager interface
+
+SET ( callmanager_xml ${CMAKE_CURRENT_SOURCE_DIR}/../sflphone-common/src/dbus/callmanager-introspec.xml )
+
+SET_SOURCE_FILES_PROPERTIES(
+ ${callmanager_xml}
+ PROPERTIES
+ CLASSNAME CallManagerInterface
+ INCLUDE "metatypes.h")
+
+QT4_ADD_DBUS_INTERFACE(
+ sflphone_client_kde_SRCS
+ ${callmanager_xml}
+ callmanager_dbus_interface)
+
+# instance interface
+
+SET ( instance_xml ${CMAKE_CURRENT_SOURCE_DIR}/../sflphone-common/src/dbus/instance-introspec.xml )
+
+SET_SOURCE_FILES_PROPERTIES(
+ ${instance_xml}
+ PROPERTIES
+ CLASSNAME InstanceInterface
+ INCLUDE "metatypes.h")
+
+QT4_ADD_DBUS_INTERFACE(
+ sflphone_client_kde_SRCS
+ ${instance_xml}
+ instance_dbus_interface)
diff --git a/sflphone-client-kde/metatypes.h b/sflphone-client-kde/src/dbus/metatypes.h
similarity index 94%
rename from sflphone-client-kde/metatypes.h
rename to sflphone-client-kde/src/dbus/metatypes.h
index 7abd086ae10fdaaac7301da18c8faf6ea2b8be33..a4b2499ba203d5207bc715430aba6da5d88d7dd3 100644
--- a/sflphone-client-kde/metatypes.h
+++ b/sflphone-client-kde/src/dbus/metatypes.h
@@ -1,7 +1,6 @@
#ifndef METATYPES_H
#define METATYPES_H
-#include <QtCore/QList>
#include <QtCore/QMetaType>
#include <QtCore/QMap>
#include <QtCore/QString>
diff --git a/sflphone-client-kde/icons/accept.svg b/sflphone-client-kde/src/icons/accept.svg
similarity index 100%
rename from sflphone-client-kde/icons/accept.svg
rename to sflphone-client-kde/src/icons/accept.svg
diff --git a/sflphone-client-kde/icons/add.png b/sflphone-client-kde/src/icons/add.png
similarity index 100%
rename from sflphone-client-kde/icons/add.png
rename to sflphone-client-kde/src/icons/add.png
diff --git a/sflphone-client-kde/icons/application-exit.png b/sflphone-client-kde/src/icons/application-exit.png
similarity index 100%
rename from sflphone-client-kde/icons/application-exit.png
rename to sflphone-client-kde/src/icons/application-exit.png
diff --git a/sflphone-client-kde/icons/busy.svg b/sflphone-client-kde/src/icons/busy.svg
similarity index 100%
rename from sflphone-client-kde/icons/busy.svg
rename to sflphone-client-kde/src/icons/busy.svg
diff --git a/sflphone-client-kde/icons/call.svg b/sflphone-client-kde/src/icons/call.svg
similarity index 100%
rename from sflphone-client-kde/icons/call.svg
rename to sflphone-client-kde/src/icons/call.svg
diff --git a/sflphone-client-kde/icons/current.svg b/sflphone-client-kde/src/icons/current.svg
similarity index 100%
rename from sflphone-client-kde/icons/current.svg
rename to sflphone-client-kde/src/icons/current.svg
diff --git a/sflphone-client-kde/icons/del_off.png b/sflphone-client-kde/src/icons/del_off.png
similarity index 100%
rename from sflphone-client-kde/icons/del_off.png
rename to sflphone-client-kde/src/icons/del_off.png
diff --git a/sflphone-client-kde/icons/del_on.png b/sflphone-client-kde/src/icons/del_on.png
similarity index 100%
rename from sflphone-client-kde/icons/del_on.png
rename to sflphone-client-kde/src/icons/del_on.png
diff --git a/sflphone-client-kde/icons/dial.svg b/sflphone-client-kde/src/icons/dial.svg
similarity index 100%
rename from sflphone-client-kde/icons/dial.svg
rename to sflphone-client-kde/src/icons/dial.svg
diff --git a/sflphone-client-kde/icons/fail.svg b/sflphone-client-kde/src/icons/fail.svg
similarity index 100%
rename from sflphone-client-kde/icons/fail.svg
rename to sflphone-client-kde/src/icons/fail.svg
diff --git a/sflphone-client-kde/icons/hang_up.svg b/sflphone-client-kde/src/icons/hang_up.svg
similarity index 100%
rename from sflphone-client-kde/icons/hang_up.svg
rename to sflphone-client-kde/src/icons/hang_up.svg
diff --git a/sflphone-client-kde/icons/history.svg b/sflphone-client-kde/src/icons/history.svg
similarity index 100%
rename from sflphone-client-kde/icons/history.svg
rename to sflphone-client-kde/src/icons/history.svg
diff --git a/sflphone-client-kde/icons/history2.svg b/sflphone-client-kde/src/icons/history2.svg
similarity index 100%
rename from sflphone-client-kde/icons/history2.svg
rename to sflphone-client-kde/src/icons/history2.svg
diff --git a/sflphone-client-kde/icons/hold.svg b/sflphone-client-kde/src/icons/hold.svg
similarity index 100%
rename from sflphone-client-kde/icons/hold.svg
rename to sflphone-client-kde/src/icons/hold.svg
diff --git a/sflphone-client-kde/icons/icon_accept.svg b/sflphone-client-kde/src/icons/icon_accept.svg
similarity index 100%
rename from sflphone-client-kde/icons/icon_accept.svg
rename to sflphone-client-kde/src/icons/icon_accept.svg
diff --git a/sflphone-client-kde/icons/icon_call.svg b/sflphone-client-kde/src/icons/icon_call.svg
similarity index 100%
rename from sflphone-client-kde/icons/icon_call.svg
rename to sflphone-client-kde/src/icons/icon_call.svg
diff --git a/sflphone-client-kde/icons/icon_dialpad.svg b/sflphone-client-kde/src/icons/icon_dialpad.svg
similarity index 100%
rename from sflphone-client-kde/icons/icon_dialpad.svg
rename to sflphone-client-kde/src/icons/icon_dialpad.svg
diff --git a/sflphone-client-kde/icons/icon_dialpad_off.svg b/sflphone-client-kde/src/icons/icon_dialpad_off.svg
similarity index 100%
rename from sflphone-client-kde/icons/icon_dialpad_off.svg
rename to sflphone-client-kde/src/icons/icon_dialpad_off.svg
diff --git a/sflphone-client-kde/icons/icon_hangup.svg b/sflphone-client-kde/src/icons/icon_hangup.svg
similarity index 100%
rename from sflphone-client-kde/icons/icon_hangup.svg
rename to sflphone-client-kde/src/icons/icon_hangup.svg
diff --git a/sflphone-client-kde/icons/icon_hold.svg b/sflphone-client-kde/src/icons/icon_hold.svg
similarity index 100%
rename from sflphone-client-kde/icons/icon_hold.svg
rename to sflphone-client-kde/src/icons/icon_hold.svg
diff --git a/sflphone-client-kde/icons/icon_rec.svg b/sflphone-client-kde/src/icons/icon_rec.svg
similarity index 100%
rename from sflphone-client-kde/icons/icon_rec.svg
rename to sflphone-client-kde/src/icons/icon_rec.svg
diff --git a/sflphone-client-kde/icons/icon_unhold.svg b/sflphone-client-kde/src/icons/icon_unhold.svg
similarity index 100%
rename from sflphone-client-kde/icons/icon_unhold.svg
rename to sflphone-client-kde/src/icons/icon_unhold.svg
diff --git a/sflphone-client-kde/icons/icon_volume.svg b/sflphone-client-kde/src/icons/icon_volume.svg
similarity index 100%
rename from sflphone-client-kde/icons/icon_volume.svg
rename to sflphone-client-kde/src/icons/icon_volume.svg
diff --git a/sflphone-client-kde/icons/icon_volume_off.svg b/sflphone-client-kde/src/icons/icon_volume_off.svg
similarity index 100%
rename from sflphone-client-kde/icons/icon_volume_off.svg
rename to sflphone-client-kde/src/icons/icon_volume_off.svg
diff --git a/sflphone-client-kde/icons/incoming.svg b/sflphone-client-kde/src/icons/incoming.svg
similarity index 100%
rename from sflphone-client-kde/icons/incoming.svg
rename to sflphone-client-kde/src/icons/incoming.svg
diff --git a/sflphone-client-kde/src/icons/led-gray.svg b/sflphone-client-kde/src/icons/led-gray.svg
new file mode 100644
index 0000000000000000000000000000000000000000..17de5519b0c9b47e996ab65c3cfe183724bb3cca
--- /dev/null
+++ b/sflphone-client-kde/src/icons/led-gray.svg
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="744.09448819"
+ height="1052.3622047"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ sodipodi:docname="led-gray.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient5185">
+ <stop
+ style="stop-color:#969995;stop-opacity:1;"
+ offset="0"
+ id="stop5187" />
+ <stop
+ style="stop-color:#252525;stop-opacity:0.97647059;"
+ offset="1"
+ id="stop5189" />
+ </linearGradient>
+ <marker
+ inkscape:stockid="Arrow2Lstart"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow2Lstart"
+ style="overflow:visible">
+ <path
+ id="path3376"
+ style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
+ d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+ transform="scale(1.1) translate(1,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Sstart"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Sstart"
+ style="overflow:visible">
+ <path
+ id="path3370"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+ transform="scale(0.2) translate(6,0)" />
+ </marker>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3165">
+ <stop
+ style="stop-color:#e16300;stop-opacity:1;"
+ offset="0"
+ id="stop3167" />
+ <stop
+ style="stop-color:#e16300;stop-opacity:0;"
+ offset="1"
+ id="stop3169" />
+ </linearGradient>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective10" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3165"
+ id="radialGradient3181"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.2682705,3.3175707,-3.0169525,0.2439616,1420.6017,-661.5798)"
+ cx="277.22891"
+ cy="368.62262"
+ fx="277.22891"
+ fy="368.62262"
+ r="62.857143" />
+ <filter
+ inkscape:collect="always"
+ id="filter3351">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="3.7100165"
+ id="feGaussianBlur3353" />
+ </filter>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5185"
+ id="radialGradient5191"
+ cx="574.9386"
+ cy="668.12408"
+ fx="574.9386"
+ fy="668.12408"
+ r="235.64999"
+ gradientTransform="matrix(-0.7572557,-0.504794,0.5925778,-0.8889426,623.74572,1505.0832)"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.6005537"
+ inkscape:cx="67.328445"
+ inkscape:cy="526.18109"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1440"
+ inkscape:window-height="840"
+ inkscape:window-x="-5"
+ inkscape:window-y="-3" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <g
+ id="g3178" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:1;fill:url(#radialGradient5191);fill-opacity:1.0;fill-rule:evenodd;stroke:#000000;stroke-width:11.30000019000000044;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:16.79999923999999822;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter3351)"
+ id="path3185"
+ sodipodi:cx="535.71429"
+ sodipodi:cy="680.93359"
+ sodipodi:rx="234.28572"
+ sodipodi:ry="234.28572"
+ d="M 770.00002,680.93359 A 234.28572,234.28572 0 1 1 301.42857,680.93359 A 234.28572,234.28572 0 1 1 770.00002,680.93359 z"
+ transform="translate(-156.52222,-149.8617)" />
+ </g>
+</svg>
diff --git a/sflphone-client-kde/src/icons/led-green.svg b/sflphone-client-kde/src/icons/led-green.svg
new file mode 100644
index 0000000000000000000000000000000000000000..005cf124956dcfc5d124122b144d04a811f9e0ab
--- /dev/null
+++ b/sflphone-client-kde/src/icons/led-green.svg
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="744.09448819"
+ height="1052.3622047"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ sodipodi:docname="led-green.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient5185">
+ <stop
+ style="stop-color:#39f400;stop-opacity:1;"
+ offset="0"
+ id="stop5187" />
+ <stop
+ style="stop-color:#004b05;stop-opacity:0.97647059;"
+ offset="1"
+ id="stop5189" />
+ </linearGradient>
+ <marker
+ inkscape:stockid="Arrow2Lstart"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow2Lstart"
+ style="overflow:visible">
+ <path
+ id="path3376"
+ style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
+ d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+ transform="scale(1.1) translate(1,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Sstart"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Sstart"
+ style="overflow:visible">
+ <path
+ id="path3370"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+ transform="scale(0.2) translate(6,0)" />
+ </marker>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3165">
+ <stop
+ style="stop-color:#e16300;stop-opacity:1;"
+ offset="0"
+ id="stop3167" />
+ <stop
+ style="stop-color:#e16300;stop-opacity:0;"
+ offset="1"
+ id="stop3169" />
+ </linearGradient>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective10" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3165"
+ id="radialGradient3181"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.2682705,3.3175707,-3.0169525,0.2439616,1420.6017,-661.5798)"
+ cx="277.22891"
+ cy="368.62262"
+ fx="277.22891"
+ fy="368.62262"
+ r="62.857143" />
+ <filter
+ inkscape:collect="always"
+ id="filter3351">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="3.7100165"
+ id="feGaussianBlur3353" />
+ </filter>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5185"
+ id="radialGradient5191"
+ cx="574.9386"
+ cy="668.12408"
+ fx="574.9386"
+ fy="668.12408"
+ r="235.64999"
+ gradientTransform="matrix(-0.7572557,-0.504794,0.5925778,-0.8889426,623.74572,1505.0832)"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.6005537"
+ inkscape:cx="67.328445"
+ inkscape:cy="526.18109"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1440"
+ inkscape:window-height="840"
+ inkscape:window-x="-5"
+ inkscape:window-y="-3" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <g
+ id="g3178" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:1;fill:url(#radialGradient5191);fill-opacity:1.0;fill-rule:evenodd;stroke:#000000;stroke-width:11.30000019000000044;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:16.79999923999999822;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter3351)"
+ id="path3185"
+ sodipodi:cx="535.71429"
+ sodipodi:cy="680.93359"
+ sodipodi:rx="234.28572"
+ sodipodi:ry="234.28572"
+ d="M 770.00002,680.93359 A 234.28572,234.28572 0 1 1 301.42857,680.93359 A 234.28572,234.28572 0 1 1 770.00002,680.93359 z"
+ transform="translate(-156.52222,-149.8617)" />
+ </g>
+</svg>
diff --git a/sflphone-client-kde/src/icons/led-red.svg b/sflphone-client-kde/src/icons/led-red.svg
new file mode 100644
index 0000000000000000000000000000000000000000..6aa39f804da88a97b9393ebb068fd3f15270542b
--- /dev/null
+++ b/sflphone-client-kde/src/icons/led-red.svg
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="744.09448819"
+ height="1052.3622047"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ sodipodi:docname="led-red.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient5185">
+ <stop
+ style="stop-color:#f40800;stop-opacity:1;"
+ offset="0"
+ id="stop5187" />
+ <stop
+ style="stop-color:#6c0000;stop-opacity:0.97647059;"
+ offset="1"
+ id="stop5189" />
+ </linearGradient>
+ <marker
+ inkscape:stockid="Arrow2Lstart"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow2Lstart"
+ style="overflow:visible">
+ <path
+ id="path3376"
+ style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
+ d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+ transform="scale(1.1) translate(1,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Sstart"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Sstart"
+ style="overflow:visible">
+ <path
+ id="path3370"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+ transform="scale(0.2) translate(6,0)" />
+ </marker>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3165">
+ <stop
+ style="stop-color:#e16300;stop-opacity:1;"
+ offset="0"
+ id="stop3167" />
+ <stop
+ style="stop-color:#e16300;stop-opacity:0;"
+ offset="1"
+ id="stop3169" />
+ </linearGradient>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective10" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3165"
+ id="radialGradient3181"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.2682705,3.3175707,-3.0169525,0.2439616,1420.6017,-661.5798)"
+ cx="277.22891"
+ cy="368.62262"
+ fx="277.22891"
+ fy="368.62262"
+ r="62.857143" />
+ <filter
+ inkscape:collect="always"
+ id="filter3351">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="3.7100165"
+ id="feGaussianBlur3353" />
+ </filter>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5185"
+ id="radialGradient5191"
+ cx="574.9386"
+ cy="668.12408"
+ fx="574.9386"
+ fy="668.12408"
+ r="235.64999"
+ gradientTransform="matrix(-0.7572557,-0.504794,0.5925778,-0.8889426,623.74572,1505.0832)"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.6005537"
+ inkscape:cx="372.04724"
+ inkscape:cy="526.18109"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1440"
+ inkscape:window-height="840"
+ inkscape:window-x="-5"
+ inkscape:window-y="-3" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <g
+ id="g3178" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:1;fill:url(#radialGradient5191);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:11.30000019;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:16.79999924;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter3351)"
+ id="path3185"
+ sodipodi:cx="535.71429"
+ sodipodi:cy="680.93359"
+ sodipodi:rx="234.28572"
+ sodipodi:ry="234.28572"
+ d="M 770.00002,680.93359 A 234.28572,234.28572 0 1 1 301.42857,680.93359 A 234.28572,234.28572 0 1 1 770.00002,680.93359 z"
+ transform="translate(-156.52222,-149.8617)" />
+ </g>
+</svg>
diff --git a/sflphone-client-kde/icons/mailbox.svg b/sflphone-client-kde/src/icons/mailbox.svg
similarity index 100%
rename from sflphone-client-kde/icons/mailbox.svg
rename to sflphone-client-kde/src/icons/mailbox.svg
diff --git a/sflphone-client-kde/icons/mic.svg b/sflphone-client-kde/src/icons/mic.svg
similarity index 100%
rename from sflphone-client-kde/icons/mic.svg
rename to sflphone-client-kde/src/icons/mic.svg
diff --git a/sflphone-client-kde/icons/mic_25.svg b/sflphone-client-kde/src/icons/mic_25.svg
similarity index 100%
rename from sflphone-client-kde/icons/mic_25.svg
rename to sflphone-client-kde/src/icons/mic_25.svg
diff --git a/sflphone-client-kde/icons/mic_50.svg b/sflphone-client-kde/src/icons/mic_50.svg
similarity index 100%
rename from sflphone-client-kde/icons/mic_50.svg
rename to sflphone-client-kde/src/icons/mic_50.svg
diff --git a/sflphone-client-kde/icons/mic_75.svg b/sflphone-client-kde/src/icons/mic_75.svg
similarity index 100%
rename from sflphone-client-kde/icons/mic_75.svg
rename to sflphone-client-kde/src/icons/mic_75.svg
diff --git a/sflphone-client-kde/icons/missed.svg b/sflphone-client-kde/src/icons/missed.svg
similarity index 100%
rename from sflphone-client-kde/icons/missed.svg
rename to sflphone-client-kde/src/icons/missed.svg
diff --git a/sflphone-client-kde/icons/office-address-book.png b/sflphone-client-kde/src/icons/office-address-book.png
similarity index 100%
rename from sflphone-client-kde/icons/office-address-book.png
rename to sflphone-client-kde/src/icons/office-address-book.png
diff --git a/sflphone-client-kde/icons/outgoing.svg b/sflphone-client-kde/src/icons/outgoing.svg
similarity index 100%
rename from sflphone-client-kde/icons/outgoing.svg
rename to sflphone-client-kde/src/icons/outgoing.svg
diff --git a/sflphone-client-kde/icons/rec_call.svg b/sflphone-client-kde/src/icons/rec_call.svg
similarity index 100%
rename from sflphone-client-kde/icons/rec_call.svg
rename to sflphone-client-kde/src/icons/rec_call.svg
diff --git a/sflphone-client-kde/icons/record.svg b/sflphone-client-kde/src/icons/record.svg
similarity index 100%
rename from sflphone-client-kde/icons/record.svg
rename to sflphone-client-kde/src/icons/record.svg
diff --git a/sflphone-client-kde/icons/refuse.svg b/sflphone-client-kde/src/icons/refuse.svg
similarity index 100%
rename from sflphone-client-kde/icons/refuse.svg
rename to sflphone-client-kde/src/icons/refuse.svg
diff --git a/sflphone-client-kde/icons/remove.png b/sflphone-client-kde/src/icons/remove.png
similarity index 100%
rename from sflphone-client-kde/icons/remove.png
rename to sflphone-client-kde/src/icons/remove.png
diff --git a/sflphone-client-kde/icons/ring.svg b/sflphone-client-kde/src/icons/ring.svg
similarity index 100%
rename from sflphone-client-kde/icons/ring.svg
rename to sflphone-client-kde/src/icons/ring.svg
diff --git a/sflphone-client-kde/icons/sflphone.png b/sflphone-client-kde/src/icons/sflphone.png
similarity index 100%
rename from sflphone-client-kde/icons/sflphone.png
rename to sflphone-client-kde/src/icons/sflphone.png
diff --git a/sflphone-client-kde/icons/sflphone.svg b/sflphone-client-kde/src/icons/sflphone.svg
similarity index 100%
rename from sflphone-client-kde/icons/sflphone.svg
rename to sflphone-client-kde/src/icons/sflphone.svg
diff --git a/sflphone-client-kde/icons/sflphone_notif.svg b/sflphone-client-kde/src/icons/sflphone_notif.svg
similarity index 100%
rename from sflphone-client-kde/icons/sflphone_notif.svg
rename to sflphone-client-kde/src/icons/sflphone_notif.svg
diff --git a/sflphone-client-kde/icons/speaker.svg b/sflphone-client-kde/src/icons/speaker.svg
similarity index 100%
rename from sflphone-client-kde/icons/speaker.svg
rename to sflphone-client-kde/src/icons/speaker.svg
diff --git a/sflphone-client-kde/icons/speaker_25.svg b/sflphone-client-kde/src/icons/speaker_25.svg
similarity index 100%
rename from sflphone-client-kde/icons/speaker_25.svg
rename to sflphone-client-kde/src/icons/speaker_25.svg
diff --git a/sflphone-client-kde/icons/speaker_50.svg b/sflphone-client-kde/src/icons/speaker_50.svg
similarity index 100%
rename from sflphone-client-kde/icons/speaker_50.svg
rename to sflphone-client-kde/src/icons/speaker_50.svg
diff --git a/sflphone-client-kde/icons/speaker_75.svg b/sflphone-client-kde/src/icons/speaker_75.svg
similarity index 100%
rename from sflphone-client-kde/icons/speaker_75.svg
rename to sflphone-client-kde/src/icons/speaker_75.svg
diff --git a/sflphone-client-kde/icons/stock_person.svg b/sflphone-client-kde/src/icons/stock_person.svg
similarity index 100%
rename from sflphone-client-kde/icons/stock_person.svg
rename to sflphone-client-kde/src/icons/stock_person.svg
diff --git a/sflphone-client-kde/icons/transfert.svg b/sflphone-client-kde/src/icons/transfert.svg
similarity index 100%
rename from sflphone-client-kde/icons/transfert.svg
rename to sflphone-client-kde/src/icons/transfert.svg
diff --git a/sflphone-client-kde/icons/unhold.svg b/sflphone-client-kde/src/icons/unhold.svg
similarity index 100%
rename from sflphone-client-kde/icons/unhold.svg
rename to sflphone-client-kde/src/icons/unhold.svg
diff --git a/sflphone-client-kde/icons/x-office-address-book.png b/sflphone-client-kde/src/icons/x-office-address-book.png
similarity index 100%
rename from sflphone-client-kde/icons/x-office-address-book.png
rename to sflphone-client-kde/src/icons/x-office-address-book.png
diff --git a/sflphone-client-kde/instance_interface_singleton.cpp b/sflphone-client-kde/src/instance_interface_singleton.cpp
similarity index 100%
rename from sflphone-client-kde/instance_interface_singleton.cpp
rename to sflphone-client-kde/src/instance_interface_singleton.cpp
diff --git a/sflphone-client-kde/instance_interface_singleton.h b/sflphone-client-kde/src/instance_interface_singleton.h
similarity index 100%
rename from sflphone-client-kde/instance_interface_singleton.h
rename to sflphone-client-kde/src/instance_interface_singleton.h
diff --git a/sflphone-client-kde/main.cpp b/sflphone-client-kde/src/main.cpp
similarity index 100%
rename from sflphone-client-kde/main.cpp
rename to sflphone-client-kde/src/main.cpp
diff --git a/sflphone-client-kde/src/qrc/resources.qrc b/sflphone-client-kde/src/qrc/resources.qrc
new file mode 100644
index 0000000000000000000000000000000000000000..73424bd026acebd196e9286adf706eb2c68f6644
--- /dev/null
+++ b/sflphone-client-kde/src/qrc/resources.qrc
@@ -0,0 +1,92 @@
+<RCC>
+ <qresource prefix="images" >
+ <file>../icons/sflphone.svg</file>
+ <file>../icons/sflphone_notif.svg</file>
+ <file>../icons/application-exit.png</file>
+ <file>../icons/office-address-book.png</file>
+ <file>../icons/x-office-address-book.png</file>
+ <file>../icons/add.png</file>
+ <file>../icons/remove.png</file>
+ <file>../icons/del_off.png</file>
+ <file>../icons/del_on.png</file>
+ <file>../icons/accept.svg</file>
+ <file>../icons/busy.svg</file>
+ <file>../icons/call.svg</file>
+ <file>../icons/current.svg</file>
+ <file>../icons/dial.svg</file>
+ <file>../icons/fail.svg</file>
+ <file>../icons/hang_up.svg</file>
+ <file>../icons/history2.svg</file>
+ <file>../icons/history.svg</file>
+ <file>../icons/hold.svg</file>
+ <file>../icons/application-exit.png</file>
+ <file>../icons/icon_accept.svg</file>
+ <file>../icons/icon_call.svg</file>
+ <file>../icons/icon_dialpad_off.svg</file>
+ <file>../icons/icon_dialpad.svg</file>
+ <file>../icons/icon_hangup.svg</file>
+ <file>../icons/icon_hold.svg</file>
+ <file>../icons/icon_rec.svg</file>
+ <file>../icons/icon_unhold.svg</file>
+ <file>../icons/icon_volume_off.svg</file>
+ <file>../icons/icon_volume.svg</file>
+ <file>../icons/incoming.svg</file>
+ <file>../icons/mailbox.svg</file>
+ <file>../icons/mic_25.svg</file>
+ <file>../icons/mic_50.svg</file>
+ <file>../icons/mic_75.svg</file>
+ <file>../icons/mic.svg</file>
+ <file>../icons/missed.svg</file>
+ <file>../icons/outgoing.svg</file>
+ <file>../icons/rec_call.svg</file>
+ <file>../icons/refuse.svg</file>
+ <file>../icons/ring.svg</file>
+ <file>../icons/sflphone.png</file>
+ <file>../icons/speaker_25.svg</file>
+ <file>../icons/speaker_50.svg</file>
+ <file>../icons/speaker_75.svg</file>
+ <file>../icons/speaker.svg</file>
+ <file>../icons/stock_person.svg</file>
+ <file>../icons/transfert.svg</file>
+ <file>../icons/unhold.svg</file>
+ <file>../icons/accept.svg</file>
+ <file>../icons/busy.svg</file>
+ <file>../icons/call.svg</file>
+ <file>../icons/current.svg</file>
+ <file>../icons/dial.svg</file>
+ <file>../icons/fail.svg</file>
+ <file>../icons/hang_up.svg</file>
+ <file>../icons/history2.svg</file>
+ <file>../icons/history.svg</file>
+ <file>../icons/hold.svg</file>
+ <file>../icons/icon_accept.svg</file>
+ <file>../icons/icon_call.svg</file>
+ <file>../icons/icon_dialpad_off.svg</file>
+ <file>../icons/icon_dialpad.svg</file>
+ <file>../icons/icon_hangup.svg</file>
+ <file>../icons/icon_hold.svg</file>
+ <file>../icons/icon_rec.svg</file>
+ <file>../icons/icon_unhold.svg</file>
+ <file>../icons/icon_volume_off.svg</file>
+ <file>../icons/icon_volume.svg</file>
+ <file>../icons/incoming.svg</file>
+ <file>../icons/mailbox.svg</file>
+ <file>../icons/mic_25.svg</file>
+ <file>../icons/mic_50.svg</file>
+ <file>../icons/mic_75.svg</file>
+ <file>../icons/mic.svg</file>
+ <file>../icons/missed.svg</file>
+ <file>../icons/outgoing.svg</file>
+ <file>../icons/rec_call.svg</file>
+ <file>../icons/refuse.svg</file>
+ <file>../icons/ring.svg</file>
+ <file>../icons/sflphone.png</file>
+ <file>../icons/speaker_25.svg</file>
+ <file>../icons/speaker_50.svg</file>
+ <file>../icons/speaker_75.svg</file>
+ <file>../icons/speaker.svg</file>
+ <file>../icons/stock_person.svg</file>
+ <file>../icons/transfert.svg</file>
+ <file>../icons/unhold.svg</file>
+ </qresource>
+</RCC>
diff --git a/sflphone-client-kde/sflphone_const.h b/sflphone-client-kde/src/sflphone_const.h
similarity index 100%
rename from sflphone-client-kde/sflphone_const.h
rename to sflphone-client-kde/src/sflphone_const.h
diff --git a/sflphone-client-kde/sflphone_kdeview.cpp b/sflphone-client-kde/src/sflphone_kdeview.cpp
similarity index 99%
rename from sflphone-client-kde/sflphone_kdeview.cpp
rename to sflphone-client-kde/src/sflphone_kdeview.cpp
index f904ed86d8941ac984e511f1825b0feedf750c29..46ce96c459a4550d0ef1123d170dabe8001e105d 100644
--- a/sflphone-client-kde/sflphone_kdeview.cpp
+++ b/sflphone-client-kde/src/sflphone_kdeview.cpp
@@ -33,6 +33,10 @@
#include <kactioncollection.h>
#include <kaction.h>
+#include <kabc/addressbook.h>
+#include <kabc/stdaddressbook.h>
+#include <kabc/addresseelist.h>
+
#include "sflphone_const.h"
#include "configurationmanager_interface_singleton.h"
#include "callmanager_interface_singleton.h"
@@ -40,10 +44,8 @@
#include "ActionSetAccountFirst.h"
#include "ContactItemWidget.h"
#include "SFLPhone.h"
+#include "typedefs.h"
-#include <kabc/addressbook.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/addresseelist.h>
using namespace KABC;
diff --git a/sflphone-client-kde/sflphone_kdeview.h b/sflphone-client-kde/src/sflphone_kdeview.h
similarity index 100%
rename from sflphone-client-kde/sflphone_kdeview.h
rename to sflphone-client-kde/src/sflphone_kdeview.h
diff --git a/sflphone-client-kde/src/typedefs.h b/sflphone-client-kde/src/typedefs.h
new file mode 100644
index 0000000000000000000000000000000000000000..cbd8cb3322c241ae0a4516867d1ca1144a7b73a7
--- /dev/null
+++ b/sflphone-client-kde/src/typedefs.h
@@ -0,0 +1,12 @@
+#ifndef TYPEDEFS_H
+#define TYPEDEFS_H
+
+#include <QtCore/QMetaType>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+
+typedef QMap<QString, QString> MapStringString;
+typedef QMap<QString, int> MapStringInt;
+
+
+#endif
\ No newline at end of file
diff --git a/sflphone-client-kde/ConfigDialog.ui b/sflphone-client-kde/src/ui/ConfigDialog.ui
similarity index 100%
rename from sflphone-client-kde/ConfigDialog.ui
rename to sflphone-client-kde/src/ui/ConfigDialog.ui
diff --git a/sflphone-client-kde/sflphone_kdeview_base.ui b/sflphone-client-kde/src/ui/sflphone_kdeview_base.ui
similarity index 100%
rename from sflphone-client-kde/sflphone_kdeview_base.ui
rename to sflphone-client-kde/src/ui/sflphone_kdeview_base.ui