Skip to content
Snippets Groups Projects
Commit 9b162d26 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'qt-client'

parents e1c129e7 798f5ab2
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 774 additions and 310 deletions
sflphone-client-kde/CMakeLists.txt
+ 4
− 167
View file @ 9b162d26
...@@ -2,14 +2,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) ...@@ -2,14 +2,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
PROJECT(sflphone-client-kde) 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}") SET(CMAKE_MODULE_PATH "${LOCAL_CMAKE_MODULE_PATH}")
# --- custom targets: --- # --- custom targets: ---
INCLUDE( ${LOCAL_CMAKE_MODULE_PATH}/TargetDistclean.cmake REQUIRED) INCLUDE( ${LOCAL_CMAKE_MODULE_PATH}/TargetDistclean.cmake REQUIRED)
FIND_PACKAGE ( Kabc REQUIRED ) FIND_PACKAGE ( Kabc REQUIRED )
FIND_PACKAGE ( PkgConfig REQUIRED ) # FIND_PACKAGE ( PkgConfig REQUIRED )
FIND_PACKAGE ( KDE4 REQUIRED ) FIND_PACKAGE ( KDE4 REQUIRED )
FIND_PACKAGE ( Qt4 REQUIRED ) FIND_PACKAGE ( Qt4 REQUIRED )
...@@ -22,173 +22,10 @@ INCLUDE_DIRECTORIES ( ${KDE4_INCLUDES} ${QT_INCLUDES} ) ...@@ -22,173 +22,10 @@ INCLUDE_DIRECTORIES ( ${KDE4_INCLUDES} ${QT_INCLUDES} )
INCLUDE ( ${CMAKE_ROOT}/Modules/CheckIncludeFiles.cmake ) INCLUDE ( ${CMAKE_ROOT}/Modules/CheckIncludeFiles.cmake )
INCLUDE( ${QT_USE_FILE} ) 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(doc)
add_subdirectory(man) add_subdirectory(man)
add_subdirectory(data)
########### 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)
#INSTALL ( CODE "MESSAGE (\"ton pere\")" )
\ No newline at end of file
sflphone-client-kde/INSTALL 0 → 100644
+ 55
− 0
View file @ 9b162d26
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
sflphone-client-kde/README
+ 23
− 11
View file @ 9b162d26
!!!!!ATTENTION!!!!! Welcome to SFLphone KDE Client!
Before starting the build you may need to setup the KDE4 environment variables. For install instructions, read the INSTALL file, in this directory.
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.
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 Copyright (c) Savoir-faire Linux, Inc 2004-2009
http://techbase.kde.org/Getting_Started/Increased_Productivity_in_KDE4_with_Scripts <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
sflphone-client-kde/cmake_modules/TargetDistclean.cmake → sflphone-client-kde/cmake/TargetDistclean.cmake
+ 81
− 0
View file @ 9b162d26
...@@ -7,27 +7,33 @@ ...@@ -7,27 +7,33 @@
IF (UNIX) IF (UNIX)
ADD_CUSTOM_TARGET (distclean @echo cleaning for source distribution) ADD_CUSTOM_TARGET (distclean @echo cleaning for source distribution)
SET(DISTCLEANED SET(DISTCLEANED
cmake.depends # cmake.depends
cmake.check_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 CMakeCache.txt
cmake.check_cache
*.cmake *.cmake
Makefile Makefile
core core.* CMakeFiles
gmon.out CMakeTmp
*~
*_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 install_manifest.txt
*.1
man/*.cmake man/*.cmake
man/Makefile man/Makefile
man/CMakeFiles man/CMakeFiles
...@@ -37,6 +43,28 @@ IF (UNIX) ...@@ -37,6 +43,28 @@ IF (UNIX)
doc/Makefile doc/Makefile
doc/CMakeFiles doc/CMakeFiles
doc/*.bz2 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( ADD_CUSTOM_COMMAND(
...@@ -44,6 +72,8 @@ IF (UNIX) ...@@ -44,6 +72,8 @@ IF (UNIX)
COMMENT "distribution clean" COMMENT "distribution clean"
COMMAND rm COMMAND rm
ARGS -Rf CMakeTmp CMakeFiles ${DISTCLEANED} ARGS -Rf CMakeTmp CMakeFiles ${DISTCLEANED}
# COMMAND find
# ARGS ". \( -name 'Makefile' -o -name 'CMakeFiles' \) -exec rm -rf {} \;"
TARGET distclean TARGET distclean
) )
ENDIF(UNIX) ENDIF(UNIX)
......
sflphone-client-kde/config.sh 0 → 100755
+ 26
− 0
View file @ 9b162d26
#!/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 "**********************************************"
sflphone-client-kde/data/CMakeLists.txt 0 → 100644
+ 4
− 0
View file @ 9b162d26
INSTALL( FILES sflphone-client-kde.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
INSTALL( FILES sflphone-client-kdeui.rc DESTINATION ${DATA_INSTALL_DIR}/sflphone-client-kde )
sflphone-client-kde/doc/CMakeLists.txt
+ 2
− 1
View file @ 9b162d26
########### install files ############### ########### 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)
sflphone-client-kde/doc/basic-use.docbook
+ 11
− 1
View file @ 9b162d26
...@@ -27,7 +27,7 @@ To switch between those windows, click on the history and address book buttons. ...@@ -27,7 +27,7 @@ To switch between those windows, click on the history and address book buttons.
<sect1 id="basic-use-call"> <sect1 id="basic-use-call">
<title>Calling somebody</title> <title>Making a call</title>
<sect2 id="basic-use-call-current"> <sect2 id="basic-use-call-current">
<title>Dialing one's number</title> <title>Dialing one's number</title>
...@@ -103,4 +103,14 @@ To switch between those windows, click on the history and address book buttons. ...@@ -103,4 +103,14 @@ To switch between those windows, click on the history and address book buttons.
<sect1 id="basic-use-config">
<title>Configuration panel</title>
<para>The configuration panel is built in accordance with KDE specifications. It is divided by options type. The panel at left shows the different option pages you can reach. Click on one of them to acceed to the corresponding page. The changes you make are not applied until you click OK or Apply. Clicking Cancel will cancel and forget every change you made since the last Apply or OK command. Be careful not to forget some changes you made in some other pages if you wanted to Cancel it. </para>
<para>There is also a specific Apply button just for the account list which is useful to manage these accounts and valid your changes to see if the accounts are well registered. </para>
</sect1>
</chapter> </chapter>
sflphone-client-kde/install.sh deleted 100755 → 0
+ 0
− 11
View file @ e1c129e7
#!/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
sflphone-client-kde/po/sflphone-client-kde.pot 0 → 100644
+ 225
− 0
View file @ 9b162d26
# 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 ""
sflphone-client-kde/po/sflphone-client-kde_fr.po 0 → 100644
+ 225
− 0
View file @ 9b162d26
# 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 ""
sflphone-client-kde/resources.qrc deleted 100644 → 0
+ 0
− 92
View file @ e1c129e7
<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>
sflphone-client-kde/Account.cpp → sflphone-client-kde/src/Account.cpp
+ 22
− 18
View file @ 9b162d26
/***************************************************************************
* Copyright (C) 2009 by Savoir-Faire Linux *
* Author : Jérémy Quentin *
* jeremy.quentin@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., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include "Account.h" #include "Account.h"
#include <QtGui/QApplication> #include <QtGui/QApplication>
...@@ -33,26 +54,9 @@ const QString account_state_name(QString & s) ...@@ -33,26 +54,9 @@ const QString account_state_name(QString & s)
Account::Account():accountId(NULL){} Account::Account():accountId(NULL){}
/*
Account::Account(QListWidgetItem & _item, QString & alias)
{
accountDetails = new MapStringString();
(*accountDetails)[ACCOUNT_ALIAS] = alias;
item = & _item;
}
Account::Account(QString & _accountId, MapStringString & _accountDetails, account_state_t & _state)
{
*accountDetails = _accountDetails;
*accountId = _accountId;
*state = _state;
}
*/
void Account::initAccountItem() void Account::initAccountItem()
{ {
//ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
item = new QListWidgetItem(); item = new QListWidgetItem();
item->setSizeHint(QSize(140,25)); item->setSizeHint(QSize(140,25));
item->setFlags(Qt::ItemIsSelectable|Qt::ItemIsDragEnabled|Qt::ItemIsDropEnabled|Qt::ItemIsEnabled); item->setFlags(Qt::ItemIsSelectable|Qt::ItemIsDragEnabled|Qt::ItemIsDropEnabled|Qt::ItemIsEnabled);
......
sflphone-client-kde/Account.h → sflphone-client-kde/src/Account.h
+ 83
− 0
View file @ 9b162d26
/***************************************************************************
* Copyright (C) 2009 by Savoir-Faire Linux *
* Author : Jérémy Quentin *
* jeremy.quentin@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., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifndef ACCOUNT_H #ifndef ACCOUNT_H
#define ACCOUNT_H #define ACCOUNT_H
...@@ -5,9 +26,11 @@ ...@@ -5,9 +26,11 @@
#include <QtGui/QListWidgetItem> #include <QtGui/QListWidgetItem>
#include <QtGui/QColor> #include <QtGui/QColor>
#include "metatypes.h" // #include "metatypes.h"
#include "AccountItemWidget.h" #include "AccountItemWidget.h"
typedef QMap<QString, QString> MapStringString;
const QString account_state_name(QString & s); const QString account_state_name(QString & s);
class Account{ class Account{
...@@ -23,12 +46,12 @@ private: ...@@ -23,12 +46,12 @@ private:
public: public:
~Account();
//Constructors //Constructors
static Account * buildExistingAccountFromId(QString _accountId); static Account * buildExistingAccountFromId(QString _accountId);
static Account * buildNewAccountFromAlias(QString alias); static Account * buildNewAccountFromAlias(QString alias);
~Account();
//Getters //Getters
bool isNew() const; bool isNew() const;
bool isChecked() const; bool isChecked() const;
......
sflphone-client-kde/AccountItemWidget.cpp → sflphone-client-kde/src/AccountItemWidget.cpp
+ 4
− 0
View file @ 9b162d26
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include "AccountItemWidget.h" #include "AccountItemWidget.h"
#include <QtGui/QHBoxLayout> #include <QtGui/QHBoxLayout>
...@@ -49,6 +50,9 @@ AccountItemWidget::AccountItemWidget(QWidget *parent) ...@@ -49,6 +50,9 @@ AccountItemWidget::AccountItemWidget(QWidget *parent)
AccountItemWidget::~AccountItemWidget() AccountItemWidget::~AccountItemWidget()
{ {
delete led;
delete checkBox;
delete textLabel;
} }
......
sflphone-client-kde/AccountItemWidget.h → sflphone-client-kde/src/AccountItemWidget.h
+ 9
− 9
View file @ 9b162d26
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifndef ACCOUNTITEMWIDGET_H #ifndef ACCOUNTITEMWIDGET_H
#define ACCOUNTITEMWIDGET_H #define ACCOUNTITEMWIDGET_H
...@@ -45,25 +46,24 @@ public: ...@@ -45,25 +46,24 @@ public:
enum State {Registered, Unregistered, NotWorking}; enum State {Registered, Unregistered, NotWorking};
//Constructors & Destructors
AccountItemWidget(QWidget *parent = 0); AccountItemWidget(QWidget *parent = 0);
~AccountItemWidget(); ~AccountItemWidget();
void setState(int state); //Getters
int getState();
bool getEnabled();
//Setters
void setState(int state);
void setEnabled(bool enabled); void setEnabled(bool enabled);
void setAccountText(QString text); void setAccountText(QString text);
//Updates
void updateStateDisplay(); void updateStateDisplay();
void updateEnabledDisplay(); void updateEnabledDisplay();
void updateDisplay(); void updateDisplay();
int getState();
bool getEnabled();
}; };
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment