diff --git a/sflphone-client-kde/CMakeLists.txt b/sflphone-client-kde/CMakeLists.txt
index e882ea808b95c716d0bafea12a61ebc87caf76ec..c3aea05a1b755b7fbdc82807e2294e6f9d8a5849 100644
--- a/sflphone-client-kde/CMakeLists.txt
+++ b/sflphone-client-kde/CMakeLists.txt
@@ -22,7 +22,7 @@ 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}\\\"")
+ADD_DEFINITIONS(${KDE4_DEFINITIONS} ${QT_DEFINITIONS} -fexceptions -DDATA_INSTALL_DIR="\\\"${DATA_INSTALL_DIR}\\\"" )
@@ -120,13 +120,41 @@ KDE4_ADD_EXECUTABLE(sflphone-client-kde ${sflphone_client_kde_SRCS} ${QtApp_RCC_
SET ( KDE4_KABC_LIBS -lkabc )
TARGET_LINK_LIBRARIES(sflphone-client-kde ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KABC_LIBS})
-INSTALL(TARGETS sflphone-client-kde DESTINATION ${BIN_INSTALL_DIR})
+
+# 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 "${CMAKE_CURRENT_BUILD_DIR}/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")
+
+
########### install files ###############
+SET ( HANDBOOK_INSTALL_DIR /usr/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 ${HANDBOOK_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_CURRENT_BUILD_DIR}/sflphone-client-kde.1 DESTINATION ${MANPAGES_INSTALL_DIR}/man1 )
+#INSTALL ( CODE "MESSAGE (\"ton pere\")" )
\ No newline at end of file
diff --git a/sflphone-client-kde/ConfigDialog.cpp b/sflphone-client-kde/ConfigDialog.cpp
index a89f156db4707bdc7998073d2dc849ddb1db90ac..f92450fc2aab31a9d69695a21d8589f164d150f6 100644
--- a/sflphone-client-kde/ConfigDialog.cpp
+++ b/sflphone-client-kde/ConfigDialog.cpp
@@ -42,14 +42,12 @@ ConfigurationDialog::ConfigurationDialog(sflphone_kdeView *parent) : QDialog(par
//TODO ajouter les items de l'interface audio ici avec les constantes
- //configuration dbus
- registerCommTypes();
ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
- connect(&configurationManager, SIGNAL(accountsChanged()),
- this, SLOT(on1_accountsChanged()));
+// connect(&configurationManager, SIGNAL(accountsChanged()),
+// this, SLOT(on1_accountsChanged()));
loadOptions();
@@ -134,7 +132,7 @@ void ConfigurationDialog::loadOptions()
comboBox1_alsaPlugin->clear();
QStringList pluginList = configurationManager.getOutputAudioPluginList();
comboBox1_alsaPlugin->addItems(pluginList);
- comboBox1_alsaPlugin->setCurrentIndex(comboBox1_alsaPlugin->findText(configurationManager.getCurrentAudioOutputPlugin()));
+ //comboBox1_alsaPlugin->setCurrentIndex(comboBox1_alsaPlugin->findText(configurationManager.getCurrentAudioOutputPlugin()));
QStringList devices = configurationManager.getCurrentAudioDevicesIndex();
@@ -376,7 +374,10 @@ void ConfigurationDialog::loadAccount(QListWidgetItem * item)
QString protocolsTab[] = ACCOUNT_TYPES_TAB;
QList<QString> * protocolsList = new QList<QString>();
- for(int i=0;i<sizeof(protocolsTab)/sizeof(QString);i++) protocolsList->append(protocolsTab[i]);
+ for(int i = 0 ; i < (int) (sizeof(protocolsTab) / sizeof(QString)) ; i++)
+ {
+ protocolsList->append(protocolsTab[i]);
+ }
QString accountName = account->getAccountDetail(ACCOUNT_TYPE);
int protocolIndex = protocolsList->indexOf(accountName);
delete protocolsList;
@@ -536,7 +537,8 @@ void ConfigurationDialog::updateCodecListCommands()
void ConfigurationDialog::on_edit1_alias_textChanged(const QString & text)
{
qDebug() << "on_edit1_alias_textChanged";
- //listWidget_accountList->currentItem()->setText(text);
+ Account * account = accountList->getAccountByItem(listWidget_accountList->currentItem());
+ account->setItemText(text);
}
void ConfigurationDialog::on_spinBox_SIPPort_valueChanged ( int value )
@@ -609,21 +611,14 @@ void ConfigurationDialog::on_button_accountUp_clicked()
void ConfigurationDialog::on_button_accountDown_clicked()
{
- qDebug() << "on_button_accountDown_clicked";
int currentRow = listWidget_accountList->currentRow();
- qDebug() << "on_button_accountDown_clicked1";
QListWidgetItem * prevItem = listWidget_accountList->takeItem(currentRow);
- qDebug() << "on_button_accountDown_clicked2";
Account * account = accountList->getAccountByItem(prevItem);
QListWidgetItem * item = account->renewItem();
delete prevItem;
- qDebug() << "on_button_accountDown_clicked3";
listWidget_accountList->insertItem(currentRow + 1 , item);
- qDebug() << "on_button_accountDown_clicked4 : " << account->getAlias() << " " << account->getItemWidget();
listWidget_accountList->setItemWidget(item, account->getItemWidget());
- qDebug() << "on_button_accountDown_clicked5";
listWidget_accountList->setCurrentItem(item);
- qDebug() << "on_button_accountDown_clicked6";
}
void ConfigurationDialog::on_button_accountAdd_clicked()
diff --git a/sflphone-client-kde/debian/control.intrepid b/sflphone-client-kde/debian/control.intrepid
index d844e823f3ee0b91ad15257b6906d3bacc2b7fc3..341395cd9fe89ec3e9433ccadf45a0f8ac77e77a 100644
--- a/sflphone-client-kde/debian/control.intrepid
+++ b/sflphone-client-kde/debian/control.intrepid
@@ -2,7 +2,7 @@ Source: sflphone-client-kde
Maintainer: SavoirFaireLinux Inc <jeremy.quentin@savoirfairelinux.com>
Section: kde
Priority: optional
-Build-Depends: debhelper (>= 5), cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2)
+Build-Depends: debhelper (>= 5), cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2), pod2man
Standards-Version: 3.7.3
Package: sflphone-client-kde
diff --git a/sflphone-client-kde/debian/control.jaunty b/sflphone-client-kde/debian/control.jaunty
index d844e823f3ee0b91ad15257b6906d3bacc2b7fc3..341395cd9fe89ec3e9433ccadf45a0f8ac77e77a 100644
--- a/sflphone-client-kde/debian/control.jaunty
+++ b/sflphone-client-kde/debian/control.jaunty
@@ -2,7 +2,7 @@ Source: sflphone-client-kde
Maintainer: SavoirFaireLinux Inc <jeremy.quentin@savoirfairelinux.com>
Section: kde
Priority: optional
-Build-Depends: debhelper (>= 5), cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2)
+Build-Depends: debhelper (>= 5), cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2), pod2man
Standards-Version: 3.7.3
Package: sflphone-client-kde
diff --git a/sflphone-client-kde/main.cpp b/sflphone-client-kde/main.cpp
index 3e0efc5661a748f70937c8bff76aba19c7daf43d..643210b508bd9499b63e4a7ed5089ff5b8a27f54 100644
--- a/sflphone-client-kde/main.cpp
+++ b/sflphone-client-kde/main.cpp
@@ -14,7 +14,7 @@
#include "instance_interface_singleton.h"
#include "sflphone_const.h"
-static const char description[] = I18N_NOOP("A KDE 4 Client for SflPhone");
+static const char description[] = I18N_NOOP("A KDE 4 Client for SFLPhone");
static const char version[] = "0.9.5";
@@ -38,13 +38,11 @@ int main(int argc, char **argv)
try
{
- InstanceInterface & instance = InstanceInterfaceSingleton::getInstance();
- instance.Register(getpid(), APP_NAME);
KAboutData about(
"sflphone-client-kde",
0,
- ki18n("sflphone KDE client"),
+ ki18n("SFLPhone KDE Client"),
version,
ki18n(description),
KAboutData::License_GPL,
@@ -60,6 +58,19 @@ int main(int argc, char **argv)
KCmdLineArgs::addCmdLineOptions(options);
KApplication app;
+
+ //configuration dbus
+ registerCommTypes();
+
+
+ if(!QFile(QDir::homePath() + CONFIG_FILE_PATH).exists())
+ {
+ (new AccountWizard())->show();
+ }
+
+ InstanceInterface & instance = InstanceInterfaceSingleton::getInstance();
+ instance.Register(getpid(), APP_NAME);
+
SFLPhone * fenetre = new SFLPhone();
QString locale = QLocale::system().name();
diff --git a/sflphone-client-kde/sflphone-client-kde.desktop b/sflphone-client-kde/sflphone-client-kde.desktop
index a30f734db914c346ef6c7c571445a3f6062070bb..b3298aaca04a17141009e57adf5c7dd99a514098 100644
--- a/sflphone-client-kde/sflphone-client-kde.desktop
+++ b/sflphone-client-kde/sflphone-client-kde.desktop
@@ -6,7 +6,7 @@
# Exec=kapp4 %i -caption "%c"
# Icon=kapp4
Type=Application
-X-DocPath=sflphone-client-kde/index.docbook
+X-DocPath=sflphone-client-kde/index.html
# GenericName=A KDE4 Application
# GenericName[ca]=Una aplicació del KDE4
# GenericName[da]=Et KDE4-program
diff --git a/sflphone-client-kde/sflphone_const.h b/sflphone-client-kde/sflphone_const.h
index 94a4d600dfe65629bfd0ef3f5f3bdf312ca9fa80..575f8e817d0e6adcc4c8d9c5b0c8a71b36fd6a0d 100644
--- a/sflphone-client-kde/sflphone_const.h
+++ b/sflphone-client-kde/sflphone_const.h
@@ -47,6 +47,7 @@
#define CONTACT_ITEM_HEIGHT 40
+#define CONFIG_FILE_PATH "/.sflphone/sflphonedrc"
#define ACTION_LABEL_CALL tr2i18n("Call")
#define ACTION_LABEL_HANG_UP tr2i18n("Hang up")
diff --git a/sflphone-client-kde/sflphone_kdeview.cpp b/sflphone-client-kde/sflphone_kdeview.cpp
index 40aab0198ad07ee65d77c705b03f285b2947ec45..6fcafc2b045dc43b60e7a2c85f7aa00e7aa7d451 100644
--- a/sflphone-client-kde/sflphone_kdeview.cpp
+++ b/sflphone-client-kde/sflphone_kdeview.cpp
@@ -79,6 +79,7 @@ sflphone_kdeView::sflphone_kdeView(QWidget *parent)
loadWindow();
+
}
sflphone_kdeView::~sflphone_kdeView()