Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
4ecd714b
Commit
4ecd714b
authored
May 26, 2005
by
llea
Browse files
Management call improved
parent
6481c872
Changes
21
Expand all
Hide whitespace changes
Inline
Side-by-side
src/Makefile
View file @
4ecd714b
#
# Makefile for sflphone
# (c) 2004 Savoir-faire Linux inc.
# (c) 2004
-2005
Savoir-faire Linux inc.
# Authors : Laurielle Lea (laurielle.lea@savoirfairelinux.com)
# Jerome Oufella (jerome.oufella@savoirfairelinux.com)
#
...
...
@@ -124,20 +124,20 @@ all: $(PROGNAME)
$(PROGNAME)
:
$(OBJS) $(EXTRALIBS)
$(CXX)
-o
$@
$(OBJS)
$(LIBS)
$(EXTRALIBS)
#
install: all
#
mkdir -p $(BIN_DIR)
#
mkdir -p $(SHARE_DIR)/$(PROGNAME)
#
install --mode=0755 $(PROGNAME) $(BIN_DIR)
#
cd ..; cp -R $(PIXMAPS) $(SHARE_DIR)/$(PROGNAME)/ ; \
#
chmod -R a+rX $(SHARE_DIR)/$(PROGNAME)/$(PIXMAPS)
#
cd ..; cp -R $(SKINS) $(SHARE_DIR)/$(PROGNAME)/ ; \
#
chmod -R a+rX $(SHARE_DIR)/$(PROGNAME)/$(SKINS)
#
cd ..; cp -R $(RINGS) $(SHARE_DIR)/$(PROGNAME)/ ; \
#
chmod -R a+rX $(SHARE_DIR)/$(PROGNAME)/$(RINGS)
#
#
uninstall:
#
rm -f $(BIN_DIR)/$(PROGNAME)
#
rm -rf $(SHARE_DIR)/$(PROGNAME)
install
:
all
mkdir
-p
$(BIN_DIR)
mkdir
-p
$(SHARE_DIR)
/
$(PROGNAME)
install
--mode
=
0755
$(PROGNAME)
$(BIN_DIR)
cd
..
;
cp
-R
$(PIXMAPS)
$(SHARE_DIR)
/
$(PROGNAME)
/
;
\
chmod
-R
a+rX
$(SHARE_DIR)
/
$(PROGNAME)
/
$(PIXMAPS)
cd
..
;
cp
-R
$(SKINS)
$(SHARE_DIR)
/
$(PROGNAME)
/
;
\
chmod
-R
a+rX
$(SHARE_DIR)
/
$(PROGNAME)
/
$(SKINS)
cd
..
;
cp
-R
$(RINGS)
$(SHARE_DIR)
/
$(PROGNAME)
/
;
\
chmod
-R
a+rX
$(SHARE_DIR)
/
$(PROGNAME)
/
$(RINGS)
uninstall
:
rm
-f
$(BIN_DIR)
/
$(PROGNAME)
rm
-rf
$(SHARE_DIR)
/
$(PROGNAME)
clean
:
rm
-f
$(PROGNAME)
*
.o audio/
*
.o audio/gsm/
*
.o gui/
*
.o gui/qt/
*
.o audio/gsm/
*
.a
*
~
*
.moc.cpp
*
.bak core.
*
...
...
src/call.cpp
View file @
4ecd714b
...
...
@@ -162,7 +162,7 @@ Call::setCallerIdNumber (const string& callerId_number)
enum
CallState
Call
::
getState
(
void
)
{
return
_state
;
return
_state
;
}
void
...
...
src/gui/guiframework.h
View file @
4ecd714b
...
...
@@ -44,6 +44,7 @@ public:
virtual
void
displayContext
(
short
id
)
=
0
;
virtual
string
getRingtoneFile
(
void
)
=
0
;
virtual
void
setup
(
void
)
=
0
;
virtual
int
selectedCall
(
void
)
=
0
;
/* Child class to parent class */
int
outgoingCall
(
const
string
&
to
);
...
...
src/gui/qt/configurationpanel.ui
View file @
4ecd714b
This diff is collapsed.
Click to expand it.
src/gui/qt/configurationpanel.ui.h
View file @
4ecd714b
...
...
@@ -166,7 +166,6 @@ void ConfigurationPanel::saveSlot()
"You must restart SFLPhone",
QMessageBox::Yes);
#endif
accept
();
}
// Handle tab view according to current item of listbox
...
...
src/gui/qt/configurationpanelui.cpp
View file @
4ecd714b
This diff is collapsed.
Click to expand it.
src/gui/qt/configurationpanelui.h
View file @
4ecd714b
/****************************************************************************
** Form interface generated from reading ui file 'gui/qt/configurationpanel.ui'
**
** Created:
Wed
May 2
5
16:
13:45
2005
** Created:
Thu
May 2
6
16:
51:17
2005
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
...
...
@@ -18,16 +18,16 @@ class QVBoxLayout;
class
QHBoxLayout
;
class
QGridLayout
;
class
QSpacerItem
;
class
QFrame
;
class
QPushButton
;
class
QListBox
;
class
QListBoxItem
;
class
QLabel
;
class
QFrame
;
class
QTabWidget
;
class
QWidget
;
class
QGroupBox
;
class
QLineEdit
;
class
QCheckBox
;
class
QPushButton
;
class
QButtonGroup
;
class
QRadioButton
;
class
QSpinBox
;
...
...
@@ -41,10 +41,6 @@ public:
ConfigurationPanel
(
QWidget
*
parent
=
0
,
const
char
*
name
=
0
,
bool
modal
=
FALSE
,
WFlags
fl
=
0
);
~
ConfigurationPanel
();
QFrame
*
line1
;
QPushButton
*
buttonHelp
;
QPushButton
*
buttonSave
;
QPushButton
*
buttonCancel
;
QListBox
*
Menu
;
QLabel
*
TitleTab
;
QFrame
*
line2
;
...
...
@@ -122,6 +118,11 @@ public:
QWidget
*
CodecsPage_4
;
QLabel
*
textLabel1
;
QLabel
*
pixmapLabel2
;
QFrame
*
line1
;
QPushButton
*
buttonHelp
;
QPushButton
*
buttonSave
;
QPushButton
*
buttonOk
;
QPushButton
*
buttonCancel
;
public
slots
:
virtual
void
saveSlot
();
...
...
@@ -131,10 +132,8 @@ public slots:
virtual
void
driverSlot
(
int
id
);
protected:
QGridLayout
*
ConfigurationPanelLayout
;
QVBoxLayout
*
layout8
;
QHBoxLayout
*
layout7
;
QSpacerItem
*
Horizontal_Spacing2
;
QVBoxLayout
*
layout20
;
QHBoxLayout
*
layout31
;
QVBoxLayout
*
layout17
;
QVBoxLayout
*
layout24
;
QGridLayout
*
groupBox1Layout
;
...
...
@@ -147,9 +146,9 @@ protected:
QVBoxLayout
*
layout11
;
QHBoxLayout
*
layout10
;
QSpacerItem
*
spacer6
;
QHBoxLayout
*
layout7
_2
;
QHBoxLayout
*
layout7
;
QSpacerItem
*
spacer3
;
QHBoxLayout
*
layout8
_2
;
QHBoxLayout
*
layout8
;
QSpacerItem
*
spacer4
;
QVBoxLayout
*
DriverChoiceLayout
;
QGridLayout
*
CodecsChoiceLayout
;
...
...
@@ -161,6 +160,9 @@ protected:
QSpacerItem
*
spacer5
;
QHBoxLayout
*
layout16_2
;
QSpacerItem
*
spacer6_2
;
QVBoxLayout
*
layout19_2
;
QHBoxLayout
*
layout28
;
QSpacerItem
*
Horizontal_Spacing2
;
protected
slots
:
virtual
void
languageChange
();
...
...
src/gui/qt/phonebookui.cpp
View file @
4ecd714b
/****************************************************************************
** Form implementation generated from reading ui file 'gui/qt/phonebook.ui'
**
** Created:
Wed
May 2
5
16:
13:44
2005
** Created:
Thu
May 2
6
16:
51:16
2005
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
...
...
src/gui/qt/phonebookui.h
View file @
4ecd714b
/****************************************************************************
** Form interface generated from reading ui file 'gui/qt/phonebook.ui'
**
** Created:
Wed
May 2
5
16:
13:44
2005
** Created:
Thu
May 2
6
16:
51:16
2005
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
...
...
src/gui/qt/qtGUImainwindow.cpp
View file @
4ecd714b
...
...
@@ -114,8 +114,6 @@ QtGUIMainWindow::QtGUIMainWindow (QWidget *parent, const char *name, WFlags f,
//VoIPLinkManagement* vlm = new VoIPLinkManagement();
//vlm->show();
// Address book dialog
// URL input dialog
_urlinput
=
new
URL_Input
(
this
);
...
...
@@ -614,9 +612,11 @@ int
QtGUIMainWindow
::
putOnHoldBusyLine
(
int
line
)
{
if
(
line
!=
-
1
and
!
phLines
[
line
]
->
getbRinging
())
{
// Occurs when newly off-hook line replaces another one.
_debug
(
"On hold line %d [id=%d]
\n
"
,
line
,
line2id
(
line
));
qt_onHoldCall
(
line2id
(
line
));
if
(
!
getCall
(
line2id
(
line
))
->
isRinging
())
{
// Occurs when newly off-hook line replaces another one.
_debug
(
"On hold line %d [id=%d]
\n
"
,
line
,
line2id
(
line
));
qt_onHoldCall
(
line2id
(
line
));
}
changeLineStatePixmap
(
line
,
ONHOLD
);
return
1
;
}
...
...
@@ -808,7 +808,7 @@ QtGUIMainWindow::displayContext (short id)
}
else
if
(
getCall
(
id
)
->
isOutgoingType
())
{
displayTextMessage
(
id
,
getCall
(
id
)
->
getCallerIdNumber
());
}
else
{
_debug
(
"No call with id
*
%d
\n
"
,
id
);
_debug
(
"No call with id %d
\n
"
,
id
);
}
}
...
...
@@ -818,6 +818,16 @@ QtGUIMainWindow::setup (void)
configuration
();
}
int
QtGUIMainWindow
::
selectedCall
(
void
)
{
int
id
=
-
1
;
if
(
getChooseLine
())
{
id
=
line2id
(
getChosenLine
());
}
return
id
;
}
////////////////////////////////////////////////////////////////////////////
// IP-phone user actions
////////////////////////////////////////////////////////////////////////////
...
...
@@ -827,13 +837,11 @@ QtGUIMainWindow::qt_outgoingCall (void)
{
int
id
,
line
;
if
(
_lcd
->
getTextBuffer
()
==
NULL
)
{
_debug
(
"Enter a phone number
\n
"
);
_callmanager
->
displayStatus
(
ENTER_NUMBER_STATUS
);
return
-
1
;
}
const
string
to
(
_lcd
->
getTextBuffer
().
ascii
());
if
(
to
.
empty
())
{
_debug
(
"Enter a phone number
\n
"
);
_callmanager
->
displayStatus
(
ENTER_NUMBER_STATUS
);
return
-
1
;
}
...
...
@@ -982,15 +990,21 @@ QtGUIMainWindow::toggleLine (int line)
if
(
call
==
NULL
)
{
// Check if the call exists
return
-
1
;
}
else
if
(
call
->
isRinging
()){
// If call is ringing
_debug
(
"CASE 1: Call %d is ringing
\n
"
,
id
);
changeLineStatePixmap
(
line
,
BUSY
);
putOnHoldBusyLine
(
busyLine
);
displayContext
(
id
);
}
else
if
(
call
->
isBusy
()){
// If call is busy, put this call on hold
_debug
(
"CASE
1:
Put Call %d on-hold
\n
"
,
id
);
_debug
(
"CASE
2
Put Call %d on-hold
\n
"
,
id
);
changeLineStatePixmap
(
line
,
ONHOLD
);
displayStatus
(
ONHOLD_STATUS
);
qt_onHoldCall
(
id
);
}
else
if
(
call
->
isOnHold
())
{
// If call is on hold, put this call on busy state
_debug
(
"CASE
2
: Put Call %d off-hold
\n
"
,
id
);
_debug
(
"CASE
3
: Put Call %d off-hold
\n
"
,
id
);
changeLineStatePixmap
(
line
,
BUSY
);
putOnHoldBusyLine
(
busyLine
);
if
(
getChooseLine
())
{
...
...
@@ -1004,7 +1018,7 @@ QtGUIMainWindow::toggleLine (int line)
displayContext
(
id
);
}
else
if
(
call
->
isIncomingType
())
{
// If incoming call occurs
_debug
(
"CASE
3
: Answer call %d
\n
"
,
id
);
_debug
(
"CASE
4
: Answer call %d
\n
"
,
id
);
changeLineStatePixmap
(
line
,
BUSY
);
putOnHoldBusyLine
(
busyLine
);
qt_answerCall
(
id
);
...
...
@@ -1014,7 +1028,7 @@ QtGUIMainWindow::toggleLine (int line)
}
}
else
{
// If just click on free line
_debug
(
"CASE
4
: New line off-hook
\n
"
);
_debug
(
"CASE
5
: New line off-hook
\n
"
);
phLines
[
line
]
->
button
()
->
setPixmap
(
TabLinePixmap
[
line
][
BUSY
]);
displayStatus
(
ENTER_NUMBER_STATUS
);
setChooseLine
(
true
);
...
...
@@ -1047,17 +1061,14 @@ QtGUIMainWindow::dial (void)
if
((
i
=
isThereIncomingCall
())
>
0
)
{
// If new incoming call
_debug
(
"Dial : new incoming call
\n
"
);
line
=
id2line
(
i
);
_TabIncomingCalls
[
line
]
=
-
1
;
toggleLine
(
line
);
}
else
if
(
getTransfer
()){
// If call transfer
_debug
(
"Dial : call transfer
\n
"
);
qt_transferCall
(
line2id
(
getCurrentLine
()));
}
else
{
// If new outgoing call
_debug
(
"Dial : outgoing call
\n
"
);
if
(
getCurrentLine
()
<
0
or
getChooseLine
())
{
line
=
qt_outgoingCall
();
}
...
...
@@ -1074,16 +1085,17 @@ QtGUIMainWindow::hangupLine (void)
int
line
=
getCurrentLine
();
int
id
=
phLines
[
line
]
->
getCallId
();
if
(
_callmanager
->
getbCongestion
())
{
_callmanager
->
congestion
(
false
);
// If congestion tone
changeLineStatePixmap
(
line
,
FREE
);
_lcd
->
clear
(
QString
(
ENTER_NUMBER_STATUS
));
}
if
(
id
>
0
and
getCall
(
id
)
->
isProgressing
())
{
qt_hangupCall
(
id
);
_callmanager
->
congestion
(
false
);
phLines
[
line
]
->
setCallId
(
0
);
}
else
if
(
line
>=
0
and
id
>
0
and
getCall
(
id
)
->
isProgressing
())
{
// If I want to cancel a call before ringing, i have to wait.
return
;
}
if
(
line
>=
0
and
id
>
0
)
{
}
else
if
(
line
>=
0
and
id
>
0
)
{
// If hangup current line normally
_debug
(
"Hangup line %d
\n
"
,
line
);
qt_hangupCall
(
id
);
changeLineStatePixmap
(
line
,
FREE
);
phLines
[
line
]
->
setCallId
(
0
);
...
...
@@ -1098,6 +1110,7 @@ QtGUIMainWindow::hangupLine (void)
changeLineStatePixmap
(
line
,
FREE
);
dialtone
(
false
);
setChooseLine
(
false
);
setCurrentLine
(
-
1
);
}
}
...
...
src/gui/qt/qtGUImainwindow.h
View file @
4ecd714b
...
...
@@ -96,6 +96,10 @@ public:
virtual
void
displayContext
(
short
id
);
virtual
string
getRingtoneFile
(
void
);
virtual
void
setup
(
void
);
/*
* Return the id matching to the chosen line
*/
virtual
int
selectedCall
(
void
);
// Handle IP-phone user actions
int
qt_outgoingCall
(
void
);
...
...
src/gui/qt/url_inputui.cpp
View file @
4ecd714b
/****************************************************************************
** Form implementation generated from reading ui file 'gui/qt/url_input.ui'
**
** Created:
Wed
May 2
5
16:
13:45
2005
** Created:
Thu
May 2
6
16:
51:17
2005
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
...
...
src/gui/qt/url_inputui.h
View file @
4ecd714b
/****************************************************************************
** Form interface generated from reading ui file 'gui/qt/url_input.ui'
**
** Created:
Wed
May 2
5
16:
13:45
2005
** Created:
Thu
May 2
6
16:
51:17
2005
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
...
...
src/gui/qt/voIPLinkmanagement.ui
View file @
4ecd714b
...
...
@@ -210,7 +210,7 @@
</property>
<widget
class=
"QLineEdit"
>
<property
name=
"name"
>
<cstring>
your
Name
</cstring>
<cstring>
full
Name
</cstring>
</property>
</widget>
<widget
class=
"QLineEdit"
>
...
...
@@ -232,11 +232,17 @@
<property
name=
"name"
>
<cstring>
password
</cstring>
</property>
<property
name=
"echoMode"
>
<enum>
Password
</enum>
</property>
</widget>
<widget
class=
"QLineEdit"
>
<property
name=
"name"
>
<cstring>
proxy
</cstring>
</property>
<property
name=
"echoMode"
>
<enum>
Normal
</enum>
</property>
</widget>
</vbox>
</widget>
...
...
@@ -258,10 +264,10 @@
</widget>
<images>
<image
name=
"image0"
>
<data
format=
"PNG"
length=
"206"
>
89504e470d0a1a0a0000000d494844520000000d000000100806000000cda3f53900000095494441542891dd91
3
10
ec3
200c45
1f4c8c9c23b90139bf19b3710f4636772911b856d5b95f42089ef0c310dadd600009fae8e49461c0514ead55c25caf3cf6d1b78d3e3a473915a0944b3d1edadd3e0c985863f40c36d6186785522ef7803d985306a98282fe3aa40a41e1abc14b902a4f4f735eaf3a1f61e54f4f2b58e37
1f
7
9f
d6783c6e8677456bb27cfba759d19a2cffc79e5e4048dcd70eb2adc5
0000000049454e44ae426082
</data>
<data
format=
"PNG"
length=
"206"
>
89504e470d0a1a0a0000000d494844520000000d000000100806000000cda3f53900000095494441542891dd91
b
10
dc4
200c45
9fa9b340ca640c32bf192003d0b2003d69ce11f1f97457df97108227fc30483d2b746081d61bebb242872defa314155bcf3cb5de1e1bad37b6bc0f809c8f1171a9677d33e0e28d2932f878a3584f9f0e84462dca80f1ebd0a2c880af061fd1a2774f36e77cdc85ec4a334ff62a339813f
1f
0
9f
e6443c3d0caf8adee4f9e39faca23779fe8f3d5d9601dc62f81b177a
0000000049454e44ae426082
</data>
</image>
<image
name=
"image1"
>
<data
format=
"PNG"
length=
"19
4
"
>
89504e470d0a1a0a0000000d494844520000000d000000100806000000cda3f5390000008
9
494441542891dd91
3112
c3300
8
04
0f2a957a87d3e5ff6fa043efa0a4538a58194494d86e7d8d34dc2c37cc918a020ea000e6865a2ab6e7a3635713a5ecb3b94d037343d4cae7f1a9a5028ef71bb4f2794ad837e6a4ec73
dc
f
0d
99892b27fc79ba8031d17c54d94ae004d94d8dc70166ca234dd74040ee0aba75f6004963d6530027f7b1a604e18fe0b9785c55de7faf453
0000000049454e44ae426082
</data>
<data
format=
"PNG"
length=
"19
5
"
>
89504e470d0a1a0a0000000d494844520000000d000000100806000000cda3f5390000008
a
494441542891dd91
b10d
c3300
c
04
9facb5804a6780ec3f0707a04a2ec05e29620514a3c476eb6f24f0717c104f2a0a388002981b6aa9d89e8f8e5d4d94b2cfe6360
dc
c
0d
512b9fc7a7960a38de6fd0cae72961df9893b2cf71c367634acafe1d6fa20e745c143751ba0234516273c359b089d274d3113880af9e7e811158f694c108fced69803961f82f0746c5f7b2f4f32c
0000000049454e44ae426082
</data>
</image>
</images>
<connections>
...
...
@@ -297,7 +303,7 @@
</connection>
</connections>
<tabstops>
<tabstop>
your
Name
</tabstop>
<tabstop>
full
Name
</tabstop>
<tabstop>
userPart
</tabstop>
<tabstop>
hostPart
</tabstop>
<tabstop>
authUser
</tabstop>
...
...
src/gui/qt/voIPLinkmanagementui.cpp
View file @
4ecd714b
/****************************************************************************
** Form implementation generated from reading ui file 'gui/qt/voIPLinkmanagement.ui'
**
** Created:
Wed
May 2
5
16:
13:46
2005
** Created:
Thu
May 2
6
16:
51:18
2005
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
...
...
@@ -27,20 +27,20 @@ static const unsigned char image0_data[] = {
0x89
,
0x50
,
0x4e
,
0x47
,
0x0d
,
0x0a
,
0x1a
,
0x0a
,
0x00
,
0x00
,
0x00
,
0x0d
,
0x49
,
0x48
,
0x44
,
0x52
,
0x00
,
0x00
,
0x00
,
0x0d
,
0x00
,
0x00
,
0x00
,
0x10
,
0x08
,
0x06
,
0x00
,
0x00
,
0x00
,
0xcd
,
0xa3
,
0xf5
,
0x39
,
0x00
,
0x00
,
0x00
,
0x95
,
0x49
,
0x44
,
0x41
,
0x54
,
0x28
,
0x91
,
0xdd
,
0x91
,
0x
3
1
,
0x0
e
,
0xc
3
,
0x20
,
0x0c
,
0x45
,
0x
1
f
,
0x
4c
,
0x
8c
,
0x
9c
,
0x
23
,
0x
b9
,
0x0
1
,
0x3
9
,
0xbf
,
0x19
,
0x
b3
,
0x
71
,
0x0
f
,
0x
46
,
0x
36
,
0x
77
,
0x
2
9
,
0x
11
,
0x
b8
,
0x
56
,
0x
d5
,
0x
b9
,
0x5f
,
0x
42
,
0x0
8
,
0x
9e
,
0x
f0
,
0xc
3
,
0x
1
0
,
0x
da
,
0x
d
d
,
0x
60
,
0x00
,
0x
09
,
0x
fa
,
0x
e
8
,
0x
e4
,
0x
94
,
0x
61
,
0x
c0
,
0x
51
,
0x
4e
,
0x
a
d
,
0x
55
,
0x
c2
,
0x
5c
,
0x
af
,
0x
3c
,
0xf
6
,
0x
d1
,
0xb
7
,
0x
8
d
,
0x
3
e
,
0x
3a
,
0x
47
,
0x3
9
,
0x
15
,
0x
a0
,
0x
94
,
0x
4b
,
0x
3d
,
0x
1e
,
0x
da
,
0x
dd
,
0x
3e
,
0x
0c
,
0x
98
,
0x
58
,
0x
63
,
0x
f4
,
0x
0c
,
0x
36
,
0x
d6
,
0x
1
8
,
0x
6
7
,
0x
85
,
0x5
2
,
0x
2e
,
0xf
7
,
0x
8
0
,
0x
3d
,
0x
98
,
0x
53
,
0x
06
,
0x
a9
,
0x
82
,
0x
82
,
0x
fe
,
0x
3
a
,
0x
a4
,
0x0
a
,
0x
41
,
0x
e1
,
0x
ab
,
0x
c
1
,
0x
4b
,
0x
90
,
0x
2a
,
0x
4f
,
0x
4f
,
0x7
3
,
0x
5e
,
0x
af
,
0x
3a
,
0x
1f
,
0x
61
,
0x
e5
,
0x
4
f
,
0x
4f
,
0x
2b
,
0x
5
8
,
0x
e
3
,
0x
7
1
,
0xf
7
,
0x9f
,
0x
d
6
,
0x
78
,
0x3c
,
0x
6e
,
0x
86
,
0x
77
,
0x
45
,
0x
6b
,
0x
b2
,
0x
7c
,
0x
fb
,
0x
a7
,
0x
59
,
0x
d1
,
0x
9a
,
0x
2c
,
0xf
f
,
0x
c7
,
0x
9e
,
0x5
e
,
0x
40
,
0x
48
,
0xdc
,
0x
d7
,
0x
0e
,
0xb
2
,
0x
ad
,
0x
c5
,
0x00
,
0x00
,
0x00
,
0x00
,
0x49
,
0x45
,
0x4e
,
0x44
,
0xae
,
0x42
,
0x95
,
0x49
,
0x44
,
0x41
,
0x54
,
0x28
,
0x91
,
0xdd
,
0x91
,
0x
b
1
,
0x0
d
,
0xc
4
,
0x20
,
0x0c
,
0x45
,
0x
9
f
,
0x
a9
,
0x
b3
,
0x
40
,
0x
ca
,
0x
64
,
0x0
c
,
0x3
2
,
0xbf
,
0x19
,
0x
20
,
0x
03
,
0x
d
0
,
0x
b2
,
0x
00
,
0x
3d
,
0x
6
9
,
0x
ce
,
0x
11
,
0x
f1
,
0x
f9
,
0x
74
,
0x5
7
,
0xd
f
,
0x
97
,
0x
1
0
,
0x
82
,
0x
27
,
0x
f
c
,
0x
3
0
,
0x
48
,
0x
3
d
,
0x
2b
,
0x
74
,
0x
60
,
0x8
1
,
0x
d6
,
0x
1b
,
0x
eb
,
0x
b2
,
0x
42
,
0x
87
,
0x
2
d
,
0x
ef
,
0x
a3
,
0x
14
,
0x
15
,
0x
5b
,
0x
c
f
,
0x
3c
,
0xb
5
,
0xd
e
,
0x
1
e
,
0x
1b
,
0x
ad
,
0x3
7
,
0x
b6
,
0x
bc
,
0x
0f
,
0x
80
,
0x
9c
,
0x
8f
,
0x
11
,
0x
71
,
0x
a9
,
0x
67
,
0x
7d
,
0x
33
,
0x
e0
,
0x
e2
,
0x
8d
,
0x
29
,
0x
32
,
0x
f
8
,
0x7
8
,
0x
a3
,
0x5
8
,
0x
4f
,
0x
9
f
,
0x0
e
,
0x
84
,
0x
46
,
0x
2d
,
0x
ca
,
0x
80
,
0x
f1
,
0x
eb
,
0x
d0
,
0xa
2
,
0x
c8
,
0x
8
0
,
0x
af
,
0x
06
,
0x
1f
,
0x
d
1
,
0x
a2
,
0x
77
,
0x
4f
,
0x
36
,
0x
e7
,
0x7
c
,
0x
dc
,
0x
85
,
0x
ec
,
0x
4a
,
0x
33
,
0x
4f
,
0xf
6
,
0x
2a
,
0x
33
,
0x
9
8
,
0x
1
3
,
0x
f
1
,
0xf
0
,
0x9f
,
0x
e
6
,
0x
44
,
0x3c
,
0x
3d
,
0x
0c
,
0x
af
,
0x
8a
,
0x
de
,
0x
e4
,
0x
f9
,
0x
e3
,
0x
9f
,
0x
ac
,
0x
a2
,
0x
37
,
0x
79
,
0xf
e
,
0x
8f
,
0x
3d
,
0x5
d
,
0x
96
,
0x
01
,
0xdc
,
0x
62
,
0x
f8
,
0x
1
b
,
0x
17
,
0x
7a
,
0x00
,
0x00
,
0x00
,
0x00
,
0x49
,
0x45
,
0x4e
,
0x44
,
0xae
,
0x42
,
0x60
,
0x82
};
...
...
@@ -48,20 +48,20 @@ static const unsigned char image1_data[] = {
0x89
,
0x50
,
0x4e
,
0x47
,
0x0d
,
0x0a
,
0x1a
,
0x0a
,
0x00
,
0x00
,
0x00
,
0x0d
,
0x49
,
0x48
,
0x44
,
0x52
,
0x00
,
0x00
,
0x00
,
0x0d
,
0x00
,
0x00
,
0x00
,
0x10
,
0x08
,
0x06
,
0x00
,
0x00
,
0x00
,
0xcd
,
0xa3
,
0xf5
,
0x39
,
0x00
,
0x00
,
0x00
,
0x8
9
,
0x49
,
0x44
,
0x41
,
0x54
,
0x28
,
0x91
,
0xdd
,
0x91
,
0x
3
1
,
0x
12
,
0xc3
,
0x30
,
0x0
8
,
0x04
,
0x
0
f
,
0x
2
a
,
0x
9
5
,
0x
7a
,
0x
87
,
0x
d3
,
0x
e5
,
0x
ff
,
0x
6
f
,
0x
a
0
,
0x
43
,
0xef
,
0xa0
,
0x
a
4
,
0x
53
,
0x
8a
,
0x5
8
,
0x
1
9
,
0x
44
,
0x
9
4
,
0x
d8
,
0x
6e
,
0x7
d
,
0x
8d
,
0x
34
,
0x
dc
,
0x
2c
,
0x
3
7
,
0x
c
c
,
0x
9
1
,
0x
8a
,
0x
0
2
,
0x0
e
,
0x
a0
,
0x
0
0
,
0x
e6
,
0x8
6
,
0x
5a
,
0x
2
a
,
0x
b6
,
0x
e7
,
0x
a3
,
0x
63
,
0x
57
,
0x
13
,
0x
a5
,
0x
ec
,
0xb
3
,
0x
b9
,
0x
4d
,
0x
0
3
,
0x
73
,
0x
43
,
0xd
4
,
0x
ca
,
0x
e7
,
0xf
1
,
0x
a9
,
0xa
5
,
0x
02
,
0x
8e
,
0x
f7
,
0x
1b
,
0x
b4
,
0x
f2
,
0x
79
,
0x
4a
,
0x
d8
,
0x
37
,
0x
e6
,
0x
a4
,
0x
ec
,
0x
73
,
0x
d
c
,
0x
f0
,
0x
d9
,
0x
98
,
0x
92
,
0x
b2
,
0x
7f
,
0x
c7
,
0x
9b
,
0x
a8
,
0x
03
,
0x
1d
,
0x
1
7
,
0x
c
5
,
0x4
d
,
0x
94
,
0x
ae
,
0x
00
,
0x
4d
,
0x
9
4
,
0x
d8
,
0x
dc
,
0x7
0
,
0x
16
,
0x
6c
,
0x
a2
,
0x
34
,
0xd
d
,
0x74
,
0x
04
,
0x
0e
,
0x
e0
,
0x
ab
,
0xa
7
,
0x
5f
,
0x
60
,
0x
04
,
0x
96
,
0x
3d
,
0x6
5
,
0x
30
,
0x
02
,
0x
7f
,
0x
7b
,
0x
1a
,
0x60
,
0x
4e
,
0x1
8
,
0xf
e
,
0x
0b
,
0x
9
7
,
0x
85
,
0xc5
,
0x
5d
,
0xe
7
,
0x
fa
,
0xf4
,
0x
53
,
0x00
,
0x00
,
0x00
,
0x00
,
0x49
,
0x45
,
0x4e
,
0x44
,
0xae
,
0x42
,
0x60
,
0x82
0x8
a
,
0x49
,
0x44
,
0x41
,
0x54
,
0x28
,
0x91
,
0xdd
,
0x91
,
0x
b
1
,
0x
0d
,
0xc3
,
0x30
,
0x0
c
,
0x04
,
0x
9
f
,
0xa
c
,
0x
b
5
,
0x
80
,
0x
4a
,
0x
67
,
0x
80
,
0x
ec
,
0x
3
f
,
0x0
7
,
0x
07
,
0xa0
,
0x4
a
,
0x
2e
,
0x
c0
,
0x5
e
,
0x
2
9
,
0x
62
,
0x
05
,
0x1
4
,
0x
a3
,
0x
c4
,
0x7
6
,
0x
eb
,
0x
6f
,
0x
24
,
0x
f0
,
0x7
1
,
0x
7
c
,
0x1
0
,
0x
4f
,
0x2
a
,
0x0
a
,
0x
38
,
0x
8
0
,
0x
02
,
0x
9
8
,
0x
1b
,
0x
6
a
,
0x
a9
,
0x
d8
,
0x
9e
,
0x
8f
,
0x
8e
,
0x
5d
,
0x
4d
,
0x
94
,
0xb
2
,
0x
cf
,
0x
e6
,
0x3
6
,
0x
0d
,
0x
cc
,
0x
0
d
,
0x
51
,
0x
2b
,
0x
9
f
,
0x
c7
,
0xa
7
,
0x
96
,
0x
0a
,
0x
38
,
0x
de
,
0x
6f
,
0x
d0
,
0x
ca
,
0x
e7
,
0x
29
,
0x
61
,
0x
df
,
0x
98
,
0x
93
,
0x
b2
,
0xc
f
,
0x
71
,
0x
c3
,
0x
67
,
0x
63
,
0x
4a
,
0x
ca
,
0x
fe
,
0x
1d
,
0x
6f
,
0x
a2
,
0x
0e
,
0x7
4
,
0x5
c
,
0x
1
4
,
0x
37
,
0x
51
,
0x
ba
,
0x
02
,
0x
3
4
,
0x
51
,
0x
62
,
0x7
3
,
0x
c3
,
0x
59
,
0x
b0
,
0x
89
,
0xd
2
,
0x74
,
0x
d3
,
0x
11
,
0x
38
,
0x
80
,
0xa
f
,
0x
9e
,
0x
7e
,
0x
81
,
0x
11
,
0x
58
,
0x
f
6
,
0x
94
,
0x
c1
,
0x
08
,
0x
fc
,
0x
ed
,
0x6
9
,
0x8
0
,
0x
39
,
0x
6
1
,
0xf
8
,
0x
2f
,
0x
0
7
,
0x
46
,
0xc5
,
0x
f
7
,
0x
b2
,
0xf4
,
0x
f3
,
0x2c
,
0x00
,
0x00
,
0x00
,
0x00
,
0x49
,
0x45
,
0x4e
,
0x44
,
0xae
,
0x42
,
0x60
,
0x82
};
...
...
@@ -81,7 +81,7 @@ VoIPLinkManagement::VoIPLinkManagement( QWidget* parent, const char* name, WFlag
setName
(
"VoIPLinkManagement"
);
QWidget
*
privateLayoutWidget
=
new
QWidget
(
this
,
"layout15"
);
privateLayoutWidget
->
setGeometry
(
QRect
(
11
,
31
,
563
,
2
7
0
)
);
privateLayoutWidget
->
setGeometry
(
QRect
(
11
,
31
,
563
,
2
8
0
)
);
layout15
=
new
QGridLayout
(
privateLayoutWidget
,
1
,
1
,
11
,
6
,
"layout15"
);
layout30
=
new
QVBoxLayout
(
0
,
0
,
6
,
"layout30"
);
...
...
@@ -140,8 +140,8 @@ VoIPLinkManagement::VoIPLinkManagement( QWidget* parent, const char* name, WFlag
layout23
=
new
QVBoxLayout
(
0
,
0
,
6
,
"layout23"
);
your
Name
=
new
QLineEdit
(
privateLayoutWidget_2
,
"
your
Name"
);
layout23
->
addWidget
(
your
Name
);
full
Name
=
new
QLineEdit
(
privateLayoutWidget_2
,
"
full
Name"
);
layout23
->
addWidget
(
full
Name
);
userPart
=
new
QLineEdit
(
privateLayoutWidget_2
,
"userPart"
);
layout23
->
addWidget
(
userPart
);
...
...
@@ -153,9 +153,11 @@ VoIPLinkManagement::VoIPLinkManagement( QWidget* parent, const char* name, WFlag
layout23
->
addWidget
(
authUser
);
password
=
new
QLineEdit
(
privateLayoutWidget_2
,
"password"
);
password
->
setEchoMode
(
QLineEdit
::
Password
);
layout23
->
addWidget
(
password
);
proxy
=
new
QLineEdit
(
privateLayoutWidget_2
,
"proxy"
);
proxy
->
setEchoMode
(
QLineEdit
::
Normal
);
layout23
->
addWidget
(
proxy
);
layout26
->
addLayout
(
layout23
,
0
,
1
);
...
...
@@ -177,7 +179,7 @@ VoIPLinkManagement::VoIPLinkManagement( QWidget* parent, const char* name, WFlag
connect
(
buttonAddVoiplink
,
SIGNAL
(
clicked
()
),
this
,
SLOT
(
addVoIPLinkSlot
()
)
);
// tab order
setTabOrder
(
your
Name
,
userPart
);
setTabOrder
(
full
Name
,
userPart
);
setTabOrder
(
userPart
,
hostPart
);
setTabOrder
(
hostPart
,
authUser
);
setTabOrder
(
authUser
,
password
);
...
...
src/gui/qt/voIPLinkmanagementui.h
View file @
4ecd714b
/****************************************************************************
** Form interface generated from reading ui file 'gui/qt/voIPLinkmanagement.ui'
**
** Created:
Wed
May 2
5
16:
13:46
2005
** Created:
Thu
May 2
6
16:
51:18
2005
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
...
...
@@ -46,7 +46,7 @@ public:
QLabel
*
textLabel4
;
QLabel
*
textLabel5
;
QLabel
*
textLabel6
;
QLineEdit
*
your
Name
;
QLineEdit
*
full
Name
;
QLineEdit
*
userPart
;
QLineEdit
*
hostPart
;
QLineEdit
*
authUser
;
...
...
src/manager.cpp
View file @
4ecd714b
...
...
@@ -266,7 +266,7 @@ Manager::hangupCall (short id)
call
=
getCall
(
id
);
call
->
setStatus
(
string
(
HUNGUP_STATUS
));
call
->
setState
(
Hungup
);
getCall
(
id
)
->
hangup
();
call
->
hangup
();
_mutex
.
enterMutex
();
_nCalls
-=
1
;
_mutex
.
leaveMutex
();
...
...
@@ -519,6 +519,11 @@ Manager::displayStatus (const string& status)
_gui
->
displayStatus
(
status
);
}
int
Manager
::
selectedCall
(
void
)
{
return
_gui
->
selectedCall
();
}
void
Manager
::
congestion
(
bool
var
)
{
...
...
@@ -732,8 +737,10 @@ Manager::selectAudioDriver (void)
audiodriver
=
new
AudioDriversOSS
(
AudioDrivers
::
ReadWrite
,
_error
);
}
else
{
_useAlsa
=
true
;
#ifdef ALSA
audiodriver
=
new
AudioDriversALSA
(
AudioDrivers
::
WriteOnly
,
_error
);
audiodriverReadAlsa
=
new
AudioDriversALSA
(
AudioDrivers
::
ReadOnly
,
_error
);
#endif
}
}
...
...
src/manager.h
View file @
4ecd714b
...
...
@@ -151,7 +151,7 @@ public:
void
displayTextMessage
(
short
id
,
const
string
&
message
);
void
displayError
(
const
string
&
error
);
void
displayStatus
(
const
string
&
status
);
int
selectedCall
(
void
);
/*
* Handle audio sounds heard by a caller while they wait for their
...
...