Skip to content
GitLab
Commit 4ecd714b authored by llea's avatar llea
Browse files

Management call improved

parent 6481c872
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.
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.
src/gui/qt/configurationpanelui.h
View file @ 4ecd714b
/****************************************************************************
** Form interface generated from reading ui file 'gui/qt/configurationpanel.ui'
**
** Created: Wed May 25 16:13:45 2005
** Created: Thu May 26 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 25 16:13:44 2005
** Created: Thu May 26 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 25 16:13:44 2005
** Created: Thu May 26 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 25 16:13:45 2005
** Created: Thu May 26 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 25 16:13:45 2005
** Created: Thu May 26 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>yourName</cstring>
<cstring>fullName</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">89504e470d0a1a0a0000000d494844520000000d000000100806000000cda3f53900000095494441542891dd91310ec3200c451f4c8c9c23b90139bf19b3710f4636772911b856d5b95f42089ef0c310dadd600009fae8e49461c0514ead55c25caf3cf6d1b78d3e3a473915a0944b3d1edadd3e0c985863f40c36d6186785522ef7803d985306a98282fe3aa40a41e1abc14b902a4f4f735eaf3a1f61e54f4f2b58e371f79fd6783c6e8677456bb27cfba759d19a2cffc79e5e4048dcd70eb2adc50000000049454e44ae426082</data>
<data format="PNG" length="206">89504e470d0a1a0a0000000d494844520000000d000000100806000000cda3f53900000095494441542891dd91b10dc4200c459fa9b340ca640c32bf192003d0b2003d69ce11f1f97457df97108227fc30483d2b746081d61bebb242872defa314155bcf3cb5de1e1bad37b6bc0f809c8f1171a9677d33e0e28d2932f878a3584f9f0e84462dca80f1ebd0a2c880af061fd1a2774f36e77cdc85ec4a334ff62a339813f1f09fe6443c3d0caf8adee4f9e39faca23779fe8f3d5d9601dc62f81b177a0000000049454e44ae426082</data>
</image>
<image name="image1">
<data format="PNG" length="194">89504e470d0a1a0a0000000d494844520000000d000000100806000000cda3f53900000089494441542891dd913112c33008040f2a957a87d3e5ff6fa043efa0a4538a58194494d86e7d8d34dc2c37cc918a020ea000e6865a2ab6e7a3635713a5ecb3b94d037343d4cae7f1a9a5028ef71bb4f2794ad837e6a4ec73dcf0d99892b27fc79ba8031d17c54d94ae004d94d8dc70166ca234dd74040ee0aba75f6004963d6530027f7b1a604e18fe0b9785c55de7faf4530000000049454e44ae426082</data>
<data format="PNG" length="195">89504e470d0a1a0a0000000d494844520000000d000000100806000000cda3f5390000008a494441542891dd91b10dc3300c049facb5804a6780ec3f0707a04a2ec05e29620514a3c476eb6f24f0717c104f2a0a388002981b6aa9d89e8f8e5d4d94b2cfe6360dcc0d512b9fc7a7960a38de6fd0cae72961df9893b2cf71c367634acafe1d6fa20e745c143751ba0234516273c359b089d274d3113880af9e7e811158f694c108fced69803961f82f0746c5f7b2f4f32c0000000049454e44ae426082</data>
</image>
</images>
<connections>
......@@ -297,7 +303,7 @@
</connection>
</connections>
<tabstops>
<tabstop>yourName</tabstop>
<tabstop>fullName</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 25 16:13:46 2005
** Created: Thu May 26 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, 0x31, 0x0e, 0xc3,
0x20, 0x0c, 0x45, 0x1f, 0x4c, 0x8c, 0x9c, 0x23, 0xb9, 0x01, 0x39, 0xbf,
0x19, 0xb3, 0x71, 0x0f, 0x46, 0x36, 0x77, 0x29, 0x11, 0xb8, 0x56, 0xd5,
0xb9, 0x5f, 0x42, 0x08, 0x9e, 0xf0, 0xc3, 0x10, 0xda, 0xdd, 0x60, 0x00,
0x09, 0xfa, 0xe8, 0xe4, 0x94, 0x61, 0xc0, 0x51, 0x4e, 0xad, 0x55, 0xc2,
0x5c, 0xaf, 0x3c, 0xf6, 0xd1, 0xb7, 0x8d, 0x3e, 0x3a, 0x47, 0x39, 0x15,
0xa0, 0x94, 0x4b, 0x3d, 0x1e, 0xda, 0xdd, 0x3e, 0x0c, 0x98, 0x58, 0x63,
0xf4, 0x0c, 0x36, 0xd6, 0x18, 0x67, 0x85, 0x52, 0x2e, 0xf7, 0x80, 0x3d,
0x98, 0x53, 0x06, 0xa9, 0x82, 0x82, 0xfe, 0x3a, 0xa4, 0x0a, 0x41, 0xe1,
0xab, 0xc1, 0x4b, 0x90, 0x2a, 0x4f, 0x4f, 0x73, 0x5e, 0xaf, 0x3a, 0x1f,
0x61, 0xe5, 0x4f, 0x4f, 0x2b, 0x58, 0xe3, 0x71, 0xf7, 0x9f, 0xd6, 0x78,
0x3c, 0x6e, 0x86, 0x77, 0x45, 0x6b, 0xb2, 0x7c, 0xfb, 0xa7, 0x59, 0xd1,
0x9a, 0x2c, 0xff, 0xc7, 0x9e, 0x5e, 0x40, 0x48, 0xdc, 0xd7, 0x0e, 0xb2,
0xad, 0xc5, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
0x95, 0x49, 0x44, 0x41, 0x54, 0x28, 0x91, 0xdd, 0x91, 0xb1, 0x0d, 0xc4,
0x20, 0x0c, 0x45, 0x9f, 0xa9, 0xb3, 0x40, 0xca, 0x64, 0x0c, 0x32, 0xbf,
0x19, 0x20, 0x03, 0xd0, 0xb2, 0x00, 0x3d, 0x69, 0xce, 0x11, 0xf1, 0xf9,
0x74, 0x57, 0xdf, 0x97, 0x10, 0x82, 0x27, 0xfc, 0x30, 0x48, 0x3d, 0x2b,
0x74, 0x60, 0x81, 0xd6, 0x1b, 0xeb, 0xb2, 0x42, 0x87, 0x2d, 0xef, 0xa3,
0x14, 0x15, 0x5b, 0xcf, 0x3c, 0xb5, 0xde, 0x1e, 0x1b, 0xad, 0x37, 0xb6,
0xbc, 0x0f, 0x80, 0x9c, 0x8f, 0x11, 0x71, 0xa9, 0x67, 0x7d, 0x33, 0xe0,
0xe2, 0x8d, 0x29, 0x32, 0xf8, 0x78, 0xa3, 0x58, 0x4f, 0x9f, 0x0e, 0x84,
0x46, 0x2d, 0xca, 0x80, 0xf1, 0xeb, 0xd0, 0xa2, 0xc8, 0x80, 0xaf, 0x06,
0x1f, 0xd1, 0xa2, 0x77, 0x4f, 0x36, 0xe7, 0x7c, 0xdc, 0x85, 0xec, 0x4a,
0x33, 0x4f, 0xf6, 0x2a, 0x33, 0x98, 0x13, 0xf1, 0xf0, 0x9f, 0xe6, 0x44,
0x3c, 0x3d, 0x0c, 0xaf, 0x8a, 0xde, 0xe4, 0xf9, 0xe3, 0x9f, 0xac, 0xa2,
0x37, 0x79, 0xfe, 0x8f, 0x3d, 0x5d, 0x96, 0x01, 0xdc, 0x62, 0xf8, 0x1b,
0x17, 0x7a, 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,
0x89, 0x49, 0x44, 0x41, 0x54, 0x28, 0x91, 0xdd, 0x91, 0x31, 0x12, 0xc3,
0x30, 0x08, 0x04, 0x0f, 0x2a, 0x95, 0x7a, 0x87, 0xd3, 0xe5, 0xff, 0x6f,
0xa0, 0x43, 0xef, 0xa0, 0xa4, 0x53, 0x8a, 0x58, 0x19, 0x44, 0x94, 0xd8,
0x6e, 0x7d, 0x8d, 0x34, 0xdc, 0x2c, 0x37, 0xcc, 0x91, 0x8a, 0x02, 0x0e,
0xa0, 0x00, 0xe6, 0x86, 0x5a, 0x2a, 0xb6, 0xe7, 0xa3, 0x63, 0x57, 0x13,
0xa5, 0xec, 0xb3, 0xb9, 0x4d, 0x03, 0x73, 0x43, 0xd4, 0xca, 0xe7, 0xf1,
0xa9, 0xa5, 0x02, 0x8e, 0xf7, 0x1b, 0xb4, 0xf2, 0x79, 0x4a, 0xd8, 0x37,
0xe6, 0xa4, 0xec, 0x73, 0xdc, 0xf0, 0xd9, 0x98, 0x92, 0xb2, 0x7f, 0xc7,
0x9b, 0xa8, 0x03, 0x1d, 0x17, 0xc5, 0x4d, 0x94, 0xae, 0x00, 0x4d, 0x94,
0xd8, 0xdc, 0x70, 0x16, 0x6c, 0xa2, 0x34, 0xdd, 0x74, 0x04, 0x0e, 0xe0,
0xab, 0xa7, 0x5f, 0x60, 0x04, 0x96, 0x3d, 0x65, 0x30, 0x02, 0x7f, 0x7b,
0x1a, 0x60, 0x4e, 0x18, 0xfe, 0x0b, 0x97, 0x85, 0xc5, 0x5d, 0xe7, 0xfa,
0xf4, 0x53, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
0x60, 0x82
0x8a, 0x49, 0x44, 0x41, 0x54, 0x28, 0x91, 0xdd, 0x91, 0xb1, 0x0d, 0xc3,
0x30, 0x0c, 0x04, 0x9f, 0xac, 0xb5, 0x80, 0x4a, 0x67, 0x80, 0xec, 0x3f,
0x07, 0x07, 0xa0, 0x4a, 0x2e, 0xc0, 0x5e, 0x29, 0x62, 0x05, 0x14, 0xa3,
0xc4, 0x76, 0xeb, 0x6f, 0x24, 0xf0, 0x71, 0x7c, 0x10, 0x4f, 0x2a, 0x0a,
0x38, 0x80, 0x02, 0x98, 0x1b, 0x6a, 0xa9, 0xd8, 0x9e, 0x8f, 0x8e, 0x5d,
0x4d, 0x94, 0xb2, 0xcf, 0xe6, 0x36, 0x0d, 0xcc, 0x0d, 0x51, 0x2b, 0x9f,
0xc7, 0xa7, 0x96, 0x0a, 0x38, 0xde, 0x6f, 0xd0, 0xca, 0xe7, 0x29, 0x61,
0xdf, 0x98, 0x93, 0xb2, 0xcf, 0x71, 0xc3, 0x67, 0x63, 0x4a, 0xca, 0xfe,
0x1d, 0x6f, 0xa2, 0x0e, 0x74, 0x5c, 0x14, 0x37, 0x51, 0xba, 0x02, 0x34,
0x51, 0x62, 0x73, 0xc3, 0x59, 0xb0, 0x89, 0xd2, 0x74, 0xd3, 0x11, 0x38,
0x80, 0xaf, 0x9e, 0x7e, 0x81, 0x11, 0x58, 0xf6, 0x94, 0xc1, 0x08, 0xfc,
0xed, 0x69, 0x80, 0x39, 0x61, 0xf8, 0x2f, 0x07, 0x46, 0xc5, 0xf7, 0xb2,
0xf4, 0xf3, 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, 270 ) );
privateLayoutWidget->setGeometry( QRect( 11, 31, 563, 280 ) );
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");
yourName = new QLineEdit( privateLayoutWidget_2, "yourName" );
layout23->addWidget( yourName );
fullName = new QLineEdit( privateLayoutWidget_2, "fullName" );
layout23->addWidget( fullName );
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( yourName, userPart );
setTabOrder( fullName, 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 25 16:13:46 2005
** Created: Thu May 26 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* yourName;
QLineEdit* fullName;
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
......