Change README

AUTHORS

@@ -1,10 +1,12 @@
-Jerome Oufella (jerome dot oufella at savoirfairelinux dot com)
-	- Many portions of code and bug fixes
+Jean-Philippe Barrette-LaPierre 
+(jean-philippe dot barrette-lapierre at savoirfairelinux dot com)
+	- Autotools support and portions of code
 
 Laurielle LEA (laurielle dot lea at savoirfairelinux dot com)
 	_ Implementation of SFLphone
 
-Jean-Philippe Barrette-LaPierre 
-(jean-philippe dot barrette-lapierre at savoirfairelinux dot com)
-	- Autotools support
+Jerome Oufella (jerome dot oufella at savoirfairelinux dot com)
+	- Many portions of code and bug fixes
+
+
 

ChangeLog

@@ -1,3 +1,6 @@
+Laurielle LEA (21 July 2005) version 0.4
+- Change README.
+
 Laurielle LEA (20 July 2005) version 0.4
 - Fix mute feature.
 - Fix many bugs about line management.

README

@@ -33,6 +33,7 @@ Dependencies build instructions:
 	make
 	make install
 	
+
 How to compile SFLphone ?
 -------------------------
 
@@ -76,6 +77,34 @@ Why does it not compile ?
 	  you have to export CXXFLAGS. 
 	  ( example: export CXXFLAGS="-I/opt/include" )
 
+
+Short description of content of source tree:
+-------------------------------------------
+- skins/ contains the different available skins in separated directories.
+- pixmaps/ contains all the pixmaps used in the configuration window.
+- rings/ contains the different ringtones.
+- stund/ is an implementation of the protocol STUN used when there is a NAT.
+- utilspp/ allows to implement a singleton.
+
+- src/ is the core of SFLphone. It contains the main.cpp, managerimpl.cpp files,  audio and gui directories, and files about signalisation SIP. 
+  Later, it should be better, when IAX will be implemented, that a directory 
+  groups these protocols. 
+  The ManagerImpl class is the intermediaire between all the layer in the tree.
+
+- src/audio/ is the audio layer. It contains all about tones, dtmf, audiodriver,  rtp layer, audio codec ulaw, alaw and gsm.
+- src/audio/gsm/ contains the implementation of gsm audiocodec library.
+- src/audio/pacpp/ implements PortAudioCpp, a native C++ binding of 
+  PortAudio V19.
+
+- src/gui/ is the directory that contains all about different user interface.
+  The GuiFramework class is the base class of all user interface objects. It
+  receives mouse, keyboard events from GUI child class and calls ManagerImpl 
+  functions which correspond. GuiFramework receives also events from ManagerImpl
+  and handle them according to the GUI chosen by the user, with virtual 
+  functions.
+- src/gui/qt is the implementation of QT user interface.
+
+
 Of course we love patches. And contribution. See http://www.sflphone.org/ .    
 The project infrastructure (CVS, bugtraqer, MLs) is maintained on : 
 http://forge.novell.com/modules/xfmod/project/?sflphone

src/gui/qt/configurationpanel.ui.h

@@ -60,7 +60,7 @@ void ConfigurationPanel::init()
      }
     } 
  }
-    // List audio devices from audiolayer 
+    // List audio devices 
     const char* devicename ; 
     const char* hostapiname;
  

src/gui/qt/qtGUImainwindow.cpp

@@ -153,10 +153,11 @@ QtGUIMainWindow::QtGUIMainWindow (QWidget *parent,
 	// Show the GUI
 	this->show();	
 
-	// Handle the tray icon system
+	// Handle the tray icon system menu
 	_mypop = new QPopupMenu(this);
-	_mypop->insertItem ("Quit", qApp, SLOT(quit()));
 	_mypop->insertItem ("Compose", _urlinput, SLOT(show()));
+	_mypop->insertItem ("Setup", this, SLOT(configuration()));
+	_mypop->insertItem ("Quit", qApp, SLOT(quit()));
 
 	_trayicon = new MyTrayIcon(QPixmap(
 				Skin::getPathPixmap(QString(PIXDIR), QString(TRAY_ICON))), 
@@ -1044,6 +1045,8 @@ int
 QtGUIMainWindow::qt_transferCall (short id)
 {
 	int i;
+	
+	_debug("------- qt_transferCall id = %d\n", id);
 	if (id != -1) {
 		const string to(_lcd->getTextBuffer().ascii());;
 		_debug("qt_transferCall: Transfer call %d to %s number\n", id, to.data());
@@ -1113,6 +1116,7 @@ QtGUIMainWindow::toggleLine (int line)
 	
 	setCurrentLine(line);
 	busyLine = busyLineNumber();
+	setTransfer(false);
 	
 	id = line2id(line);
 	if (id > 0) {
@@ -1173,6 +1177,7 @@ QtGUIMainWindow::dial (void)
 		}
 	} else if (getTransfer()){
 		// If call transfer
+		setTransfer(false);
 		if(qt_transferCall (line2id(getCurrentLine())) != 1) {
 			Manager::instance().displayErrorText("Transfer failed !\n");
 		}

src/managerimpl.cpp

@@ -346,6 +346,7 @@ ManagerImpl::onHoldCall (short id)
 		return -1;
 	call->setStatus(string(ONHOLD_STATUS));
 	call->setState(OnHold);
+	
 	return call->onHold();
 }