Menu
▾
▴
[kphone-devel] CVS:commitlog: kphoneSI/kphone extcontrol1.cpp extcontrol2.cpp extcontrol3.cpp extcontrol4.cpp sessioncontrol.cpp
|
From: klausfleischmann <kgf...@us...> - 2005-10-18 20:01:03
|
kgfleischmann 2005/10/18 13:00:56 PDT
Kphone CVS Repository
Modified files:
kphone extcontrol1.cpp extcontrol2.cpp
extcontrol3.cpp extcontrol4.cpp
sessioncontrol.cpp
Log:
generalized sessions: database error
Revision Changes Path
1.2 +4 -2 kphoneSI/kphone/extcontrol1.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/extcontrol1.cpp?r1=1.1&r2=1.2
1.2 +7 -7 kphoneSI/kphone/extcontrol2.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/extcontrol2.cpp?r1=1.1&r2=1.2
1.2 +8 -7 kphoneSI/kphone/extcontrol3.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/extcontrol3.cpp?r1=1.1&r2=1.2
1.2 +8 -6 kphoneSI/kphone/extcontrol4.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/extcontrol4.cpp?r1=1.1&r2=1.2
1.2 +64 -42 kphoneSI/kphone/sessioncontrol.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/sessioncontrol.cpp?r1=1.1&r2=1.2
Index: extcontrol1.cpp
===================================================================
RCS file: /cvsroot/kphone/kphoneSI/kphone/extcontrol1.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extcontrol1.cpp 12 Oct 2005 18:18:09 -0000 1.1
+++ extcontrol1.cpp 18 Oct 2005 20:00:56 -0000 1.2
@@ -62,7 +62,6 @@
"/KPhoneSI/"+pFix+"/SessionType1/VectorId", "" );
vecId = new QLineEdit( vectorid, vbox );
vecId->setMinimumWidth( fontMetrics().maxWidth() * 20 );
-
//The Hold Flag
holdBG = new QHButtonGroup( "Hold Allowed ", vbox );
QRadioButton *HoldYes = new QRadioButton( "Yes", holdBG );
@@ -153,7 +152,6 @@
a->setExtPR1 ( extPR->text() );
settings.writeEntry( "/KPhoneSI/"+pFix+"/SessionType1/param", extPR->text() );
-
a->setVectorId1 ( vecId->text() );
settings.writeEntry( "/KPhoneSI/"+pFix+"/SessionType1/VectorId", vecId->text() );
@@ -161,20 +159,24 @@
case rstYes:
settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType1/Rst", "Yes");
a->allowRemoteStart (SipCall::extCall1,true );//
+ printf("*sc*sc* extControl %d Rst yes \n",(int)SipCall::extCall1);
break;
default:
settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType1/Rst", "No");
a->allowRemoteStart (SipCall::extCall1,false );//
+ printf("*sc*sc* extControl %d Rst no \n",(int)SipCall::extCall1);
break;
}
switch( holdBG->id(holdBG->selected())) {
case holdYes:
settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType1/Hold", "Yes");
+ printf("*sc*sc* extControl hold \n");
a->setHoldAllowed (SipCall::extCall1,true );//
break;
default:
settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType1/Hold", "No");
+ printf("*sc*sc* extControl no hold \n");
a->setHoldAllowed (SipCall::extCall1,false );//
break;
}
Index: extcontrol2.cpp
===================================================================
RCS file: /cvsroot/kphone/kphoneSI/kphone/extcontrol2.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extcontrol2.cpp 12 Oct 2005 18:18:09 -0000 1.1
+++ extcontrol2.cpp 18 Oct 2005 20:00:56 -0000 1.2
@@ -107,9 +107,9 @@
QRadioButton *Usertp = new QRadioButton( "RTP", usetcpBG );
usetcpBG->insert( Usertp, usertp );
- if (settings.readEntry( "/KPhoneSI/"+pFix+"/SessionType1/UseTCP", "UDP" ) == "TCP") {
+ if (settings.readEntry( "/KPhoneSI/"+pFix+"/SessionType2/UseTCP", "UDP" ) == "TCP") {
usetcpBG->setButton(usetcp);
- } else if (settings.readEntry( "/KPhoneSI/"+pFix+"/SessionType1/UseTCP", "UDP" ) == "UDP") {
+ } else if (settings.readEntry( "/KPhoneSI/"+pFix+"/SessionType2/UseTCP", "UDP" ) == "UDP") {
usetcpBG->setButton(useudp);
} else {
usetcpBG->setButton(usertp);
@@ -183,26 +183,26 @@
switch( usetcpBG->id(usetcpBG->selected())) {
case usetcp:
- settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType1/UseTCP","TCP");
+ settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType2/UseTCP","TCP");
a->setUseTCP (SipCall::extCall1,0 );//
break;
case useudp:
- settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType1/UseTCP","UDP");
+ settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType2/UseTCP","UDP");
a->setUseTCP (SipCall::extCall1,1 );//
break;
default:
- settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType1/UseTCP","RTP");
+ settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType2/UseTCP","RTP");
a->setUseTCP (SipCall::extCall1,2 );//
break;
}
switch( usesoundBG->id(usesoundBG->selected())) {
case usesoundYes:
- settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType1/UseSound","Yes");
+ settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType2/UseSound","Yes");
a->setActiveOnly (SipCall::extCall1,true );//
break;
default:
- settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType1/UseSound","No");
+ settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType2/UseSound","No");
a->setActiveOnly (SipCall::extCall1,false );//
break;
}
Index: extcontrol3.cpp
===================================================================
RCS file: /cvsroot/kphone/kphoneSI/kphone/extcontrol3.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extcontrol3.cpp 12 Oct 2005 18:18:10 -0000 1.1
+++ extcontrol3.cpp 18 Oct 2005 20:00:56 -0000 1.2
@@ -62,7 +62,6 @@
"/KPhoneSI/"+pFix+"/SessionType3/VectorId", "" );
vecId = new QLineEdit( vectorid, vbox );
vecId->setMinimumWidth( fontMetrics().maxWidth() * 20 );
-
//The Hold Flag
holdBG = new QHButtonGroup( "Hold Allowed ", vbox );
QRadioButton *HoldYes = new QRadioButton( "Yes", holdBG );
@@ -107,9 +106,9 @@
QRadioButton *Usertp = new QRadioButton( "RTP", usetcpBG );
usetcpBG->insert( Usertp, usertp );
- if (settings.readEntry( "/KPhoneSI/"+pFix+"/SessionType1/UseTCP", "UDP" ) == "TCP") {
+ if (settings.readEntry( "/KPhoneSI/"+pFix+"/SessionType3/UseTCP", "UDP" ) == "TCP") {
usetcpBG->setButton(usetcp);
- } else if (settings.readEntry( "/KPhoneSI/"+pFix+"/SessionType1/UseTCP", "UDP" ) == "UDP") {
+ } else if (settings.readEntry( "/KPhoneSI/"+pFix+"/SessionType3/UseTCP", "UDP" ) == "UDP") {
usetcpBG->setButton(useudp);
} else {
usetcpBG->setButton(usertp);
@@ -157,7 +156,7 @@
a->setVectorId2 ( vecId->text() );
settings.writeEntry( "/KPhoneSI/"+pFix+"/SessionType3/VectorId", vecId->text() );
-
+
switch( rstBG->id(rstBG->selected())) {
case rstYes:
settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType3/Rst", "Yes");
@@ -172,25 +171,27 @@
switch( holdBG->id(holdBG->selected())) {
case holdYes:
settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType3/Hold", "Yes");
+ printf("*sc*sc* extControl hold \n");
a->setHoldAllowed (SipCall::extCall3,true );//
break;
default:
settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType3/Hold", "No");
+ printf("*sc*sc* extControl no hold \n");
a->setHoldAllowed (SipCall::extCall3,false );//
break;
}
switch( usetcpBG->id(usetcpBG->selected())) {
case usetcp:
- settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType1/UseTCP","TCP");
+ settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType3/UseTCP","TCP");
a->setUseTCP (SipCall::extCall1,0 );//
break;
case useudp:
- settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType1/UseTCP","UDP");
+ settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType3/UseTCP","UDP");
a->setUseTCP (SipCall::extCall1,1 );//
break;
default:
- settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType1/UseTCP","RTP");
+ settings.writeEntry("/KPhoneSI/"+pFix+"/SessionType3/UseTCP","RTP");
a->setUseTCP (SipCall::extCall1,2 );//
break;
}
Index: extcontrol4.cpp
===================================================================
RCS file: /cvsroot/kphone/kphoneSI/kphone/extcontrol4.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extcontrol4.cpp 12 Oct 2005 18:18:10 -0000 1.1
+++ extcontrol4.cpp 18 Oct 2005 20:00:56 -0000 1.2
@@ -63,7 +63,6 @@
"/KPhoneSI/"+pFix+"/SessionType4/VectorId", "no" );
vecId = new QLineEdit( vectorid, vbox );
vecId->setMinimumWidth( fontMetrics().maxWidth() * 20 );
-
//The Hold Flag
holdBG = new QHButtonGroup( "Hold Allowed ", vbox );
QRadioButton *HoldYes = new QRadioButton( "Yes", holdBG );
@@ -109,9 +108,9 @@
QRadioButton *Usertp = new QRadioButton( "RTP", usetcpBG );
usetcpBG->insert( Usertp, usertp );
- if (settings.readEntry( "/KPhoneSI/"+pFix+"/SessionType1/UseTCP", "UDP" ) == "TCP") {
+ if (settings.readEntry( "/KPhoneSI/"+pFix+"/SessionType4/UseTCP", "UDP" ) == "TCP") {
usetcpBG->setButton(usetcp);
- } else if (settings.readEntry( "/KPhoneSI/"+pFix+"/SessionType1/UseTCP", "UDP" ) == "UDP") {
+ } else if (settings.readEntry( "/KPhoneSI/"+pFix+"/SessionType4/UseTCP", "UDP" ) == "UDP") {
usetcpBG->setButton(useudp);
} else {
usetcpBG->setButton(usertp);
----------------------------------------------
Diff block truncated. (Max lines = 200)
----------------------------------------------
|