Less bugs, cleaner code, more little features

sflphone-client-kde/data/sflphone-client-kdeui.rc

@@ -36,7 +36,7 @@
 		</Menu>
 	</MenuBar>
 	
-        <ToolBar name="mainToolBar" position="Top" noMerge="1" fullWidth="true" newline="true" >
+        <ToolBar name="mainToolBar" iconText="icononly" position="Top" noMerge="1" fullWidth="false" newline="true" >
                 <Action name="action_accept" />
                 <Action name="action_mailBox" />
                 <Action name="action_refuse" />

sflphone-client-kde/src/Call.cpp

@@ -160,7 +160,7 @@ Call::Call(QString confId, QString account)
    this->confId = confId;
    this->account = account;
 }
-
+#include <unistd.h>
 Call * Call::buildExistingCall(QString callId)
 {
    CallManagerInterface & callManager = CallManagerInterfaceSingleton::getInstance();
@@ -712,3 +712,9 @@ QString Call::getConfId() const {
 void Call::setConfId(QString value) {
    confId = value;
 }
+
+QString Call::getCurrentCodecName() {
+   CallManagerInterface & callManager = CallManagerInterfaceSingleton::getInstance();
+   qDebug() << "Codec name: " << callManager.getCurrentCodecName(callId); sleep(5);
+   return callManager.getCurrentCodecName(callId);
+}
\ No newline at end of file

sflphone-client-kde/src/Call.h

@@ -258,6 +258,7 @@ public:
    bool isHistory() const;
    QString getStopTimeStamp() const;
    QString getStartTimeStamp() const;
+   QString getCurrentCodecName();
    bool isConference() const;
    
    void setConference(bool value);

sflphone-client-kde/src/CallModel.h

@@ -33,7 +33,7 @@
 
 /** Note from the author: It was previously done by a QAbstractModel + QTreeView, but the sip-call use case is incompatible 
  *  with the MVC model. The MVC never got to a point were it was bug-free and the code was getting dirty. The QTreeWidget
- *  solution may be less "clean" than MVC, but is 3 time smaller and easier to improve.
+ *  solution may be less "clean" than MVC, but is 3 time smaller and easier to improve (in fact, possible to improve).
  *  
  *  This model is the view itself (private inheritance) so drag and drop can interact directly with the model without cross
  *  layer hack. This call merge the content of 4 previous classes (CallTreeModel, CallTreeView, CallList and most of the 
@@ -91,6 +91,7 @@ class CallModel : private QTreeWidget {
       bool addParticipant(Call* call2, Call* conference);
       bool detachParticipant(Call* call);
       void conferenceChanged(const QString &confId, const QString &state);
+      void conferenceRemoved(const QString &confId);
       
       MapStringString getHistoryMap();
       

sflphone-client-kde/src/CallTreeItem.cpp

@@ -25,6 +25,7 @@
 
 #include <klocale.h>
 #include <kdebug.h>
+#include <unistd.h>
 
 #include "sflphone_const.h"
 #include "CallTreeItem.h"
@@ -32,7 +33,7 @@
 const char * CallTreeItem::callStateIcons[12] = {ICON_INCOMING, ICON_RINGING, ICON_CURRENT, ICON_DIALING, ICON_HOLD, ICON_FAILURE, ICON_BUSY, ICON_TRANSFER, ICON_TRANSF_HOLD, "", "", ICON_CONFERENCE};
 
 CallTreeItem::CallTreeItem(QWidget *parent)
-   : itemCall(0), QWidget(parent)
+   : itemCall(0), QWidget(parent), init(false)
 {
    
 }
@@ -51,6 +52,22 @@ void CallTreeItem::setCall(Call *call)
 {
    itemCall = call;
    
+   if (itemCall->isConference()) {
+      if (!init) {
+         labelHistoryPeerName = new QLabel("Conference",this);
+         labelIcon = new QLabel("Icn",this);
+         QHBoxLayout* mainLayout = new QHBoxLayout();
+         mainLayout->addWidget(labelIcon);
+         mainLayout->addWidget(labelHistoryPeerName);
+         setLayout(mainLayout);
+         init = true;
+      }
+      labelIcon->setPixmap(QPixmap(ICON_CONFERENCE));
+      labelIcon->setVisible(true);
+      labelHistoryPeerName->setVisible(true);
+      return;
+   }
+
    labelIcon = new QLabel();
    labelCallNumber2 = new QLabel(itemCall->getPeerPhoneNumber());
    labelTransferPrefix = new QLabel(i18n("Transfer to : "));
@@ -60,6 +77,9 @@ void CallTreeItem::setCall(Call *call)
    QHBoxLayout * mainLayout = new QHBoxLayout();
    mainLayout->setContentsMargins ( 3, 1, 2, 1);
    
+   labelCodec = new QLabel(this);
+   labelCodec->setText("Codec: "+itemCall->getCurrentCodecName());
+   
    mainLayout->setSpacing(4);
    QVBoxLayout * descr = new QVBoxLayout();
    descr->setMargin(1);
@@ -75,6 +95,7 @@ void CallTreeItem::setCall(Call *call)
    }
 
    descr->addWidget(labelCallNumber2);
+   descr->addWidget(labelCodec);
    transfer->addWidget(labelTransferPrefix);
    transfer->addWidget(labelTransferNumber);
    descr->addLayout(transfer);
@@ -92,9 +113,6 @@ void CallTreeItem::setCall(Call *call)
 
 void CallTreeItem::updated()
 {
-   if (itemCall->isConference())
-      return;
-   
    call_state state = itemCall->getState();
    bool recording = itemCall->getRecording();
    if(state != CALL_STATE_OVER) {
@@ -122,10 +140,14 @@ void CallTreeItem::updated()
    else {
       qDebug() << "Updating item of call of state OVER. Doing nothing.";
    }
+   
 }
 
 void CallTreeItem::setConference(bool value) {
    conference = value;
+   labelIcon->setPixmap(QPixmap(ICON_CONFERENCE));
+   //labelTransferNumber->setVisible(false);
+   //labelTransferPrefix->setVisible(false);
 }
 
 bool CallTreeItem::isConference() {