[ #7899 #7900 ] Fix toolbar icons

kde/src/CallView.cpp

@@ -52,14 +52,15 @@ CallView::CallView(QWidget* parent) : QTreeWidget(parent)
    setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
 
    //User Interface even
-   //              SENDER                              SIGNAL                       RECEIVER                  SLOT                          /
-   /**/connect(this              , SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int) ) , this, SLOT( itemDoubleClicked(QTreeWidgetItem*,int)) );
-   /**/connect(this              , SIGNAL(itemClicked(QTreeWidgetItem*,int)       ) , this, SLOT( itemClicked(QTreeWidgetItem*,int))       );
-   /**/connect(SFLPhone::model() , SIGNAL(conferenceCreated(Call*)                ) , this, SLOT( addConference(Call*))                    );
-   /**/connect(SFLPhone::model() , SIGNAL(conferenceChanged(Call*)                ) , this, SLOT( conferenceChanged(Call*))                );
-   /**/connect(SFLPhone::model() , SIGNAL(aboutToRemoveConference(Call*)          ) , this, SLOT( conferenceRemoved(Call*))                );
-   /**/connect(SFLPhone::model() , SIGNAL(callAdded(Call*,Call*)                  ) , this, SLOT( addCall(Call*,Call*))                    );
-   /*                                                                                                                                      */
+   //              SENDER                                   SIGNAL                              RECEIVER                     SLOT                        /
+   /**/connect(this              , SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)              ) , this, SLOT( itemDoubleClicked(QTreeWidgetItem*,int)) );
+   /**/connect(this              , SIGNAL(itemClicked(QTreeWidgetItem*,int)                    ) , this, SLOT( itemClicked(QTreeWidgetItem*,int))       );
+   /**/connect(this              , SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)) , this, SLOT( itemClicked(QTreeWidgetItem*))           );
+   /**/connect(SFLPhone::model() , SIGNAL(conferenceCreated(Call*)                             ) , this, SLOT( addConference(Call*))                    );
+   /**/connect(SFLPhone::model() , SIGNAL(conferenceChanged(Call*)                             ) , this, SLOT( conferenceChanged(Call*))                );
+   /**/connect(SFLPhone::model() , SIGNAL(aboutToRemoveConference(Call*)                       ) , this, SLOT( conferenceRemoved(Call*))                );
+   /**/connect(SFLPhone::model() , SIGNAL(callAdded(Call*,Call*)                               ) , this, SLOT( addCall(Call*,Call*))                    );
+   /*                                                                                                                                                   */
 
 }
 

kde/src/CallView.h

@@ -75,12 +75,12 @@ class CallView : public QTreeWidget {
       
    public slots:
       void destroyCall        ( Call* toDestroy);
-      void itemDoubleClicked  ( QTreeWidgetItem* item, int column  );
-      void itemClicked        ( QTreeWidgetItem* item, int column  );
-      Call* addCall           ( Call* call, Call* parent =0        );
-      Call* addConference     ( Call* conf                         );
-      bool conferenceChanged  ( Call* conf                         );
-      void conferenceRemoved  ( Call* conf                         );
+      void itemDoubleClicked  ( QTreeWidgetItem* item, int column    );
+      void itemClicked        ( QTreeWidgetItem* item, int column =0 );
+      Call* addCall           ( Call* call, Call* parent =0          );
+      Call* addConference     ( Call* conf                           );
+      bool conferenceChanged  ( Call* conf                           );
+      void conferenceRemoved  ( Call* conf                           );
 
       virtual void keyPressEvent(QKeyEvent* event);
 

kde/src/SFLPhoneView.cpp

@@ -71,6 +71,7 @@ SFLPhoneView::SFLPhoneView(QWidget *parent)
    //                SENDER                                        SIGNAL                             RECEIVER                                            SLOT                                  /
    /**/connect(SFLPhone::model()                     , SIGNAL(incomingCall(Call*))                   , this                                  , SLOT(on1_incomingCall(Call*)                    ));
    /**/connect(SFLPhone::model()                     , SIGNAL(voiceMailNotify(const QString &, int)) , this                                  , SLOT(on1_voiceMailNotify(const QString &, int)  ));
+   /**/connect(callTreeModel                         , SIGNAL(itemChanged(Call*))                    , this                                  , SLOT(updateWindowCallState()                    ));
    /**///connect(SFLPhone::model()                     , SIGNAL(volumeChanged(const QString &, double)), this                                , SLOT(on1_volumeChanged(const QString &, double) ));
    /**/connect(SFLPhone::model()                     , SIGNAL(callStateChanged(Call*))               , this                                  , SLOT(updateWindowCallState()                    ));
    /**/connect(TreeWidgetCallModel::getAccountList() , SIGNAL(accountListUpdated())                  , this                                  , SLOT(updateStatusMessage()                      ));
@@ -246,6 +247,7 @@ void SFLPhoneView::action(Call* call, call_action action)
 ///Change GUI icons
 void SFLPhoneView::updateWindowCallState()
 {
+   kDebug() << "Call state changed";
    bool enabledActions[6]= {true,true,true,true,true,true};
    QString buttonIconFiles[6] = {ICON_CALL, ICON_HANGUP, ICON_HOLD, ICON_TRANSFER, ICON_REC_DEL_OFF, ICON_MAILBOX};
    QString actionTexts[6] = {ACTION_LABEL_CALL, ACTION_LABEL_HANG_UP, ACTION_LABEL_HOLD, ACTION_LABEL_TRANSFER, ACTION_LABEL_RECORD, ACTION_LABEL_MAILBOX};

kde/src/SFLPhoneView.h

@@ -83,8 +83,7 @@ public:
    
    
    QErrorMessage * getErrorWindow();
-
-   CallView* model();
+   
    
    //Daemon getters
    /**
@@ -150,12 +149,6 @@ private slots:
     *   Keeps the peer name of the contact or past call.
     */
    void editBeforeCall();
-   
-   /**
-    *   Updates the toolbar's actions' display according to the selected 
-    *   item's state.
-    */
-   void updateWindowCallState();
 
    /**
     * Updates the history's search bar's display according to the current
@@ -177,6 +170,12 @@ public slots:
     */
    void loadWindow();
    
+   /**
+    *   Updates the toolbar's actions' display according to the selected 
+    *   item's state.
+    */
+   void updateWindowCallState();
+   
    
    void updateStatusMessage();
    

kde/src/widgets/CallTreeItem.cpp

@@ -198,4 +198,5 @@ void CallTreeItem::updated()
    else {
       //kDebug() << "Updating item of call of state OVER. Doing nothing.";
    }
+   changed();
 }

kde/src/widgets/CallTreeItem.h

@@ -70,7 +70,8 @@ class CallTreeItem : public QWidget
 public slots:
    void updated();
 signals:
-   void over(Call*);  
+   void over(Call*);
+   void changed();
  };
 
 #endif // CALLTREE_ITEM_H