Ticket #1982: 1982_TransferSpeed.patch

src/interface/led.cpp

@@ -6 +6 @@
 #define new DEBUG_NEW
 #endif
 
+DEFINE_EVENT_TYPE(fzEVT_UPDATE_LED_TOOLTIP)
+
 BEGIN_EVENT_TABLE(CLed, wxWindow)
     EVT_PAINT(CLed::OnPaint)
     EVT_TIMER(wxID_ANY, CLed::OnTimer)
+    EVT_ENTER_WINDOW(CLed::OnEnterWindow)
 #ifdef __WXMSW__
     EVT_ERASE_BACKGROUND(CLed::OnEraseBackground)
 #endif
@@ -94 +97 @@
     return;
 }
 
+void CLed::OnEnterWindow(wxMouseEvent& event)
+{
+    wxCommandEvent requestUpdateEvent(fzEVT_UPDATE_LED_TOOLTIP, GetId());
+    requestUpdateEvent.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(requestUpdateEvent);
+}
+
 void CLed::Ping()
 {
     if (!m_loaded)

src/interface/led.h

@@ -1 +1 @@
 #ifndef __LED_H__
 #define __LED_H__
 
+#include "wx/event.h"
+
 class CFileZillaEngine;
+
+DECLARE_EVENT_TYPE(fzEVT_UPDATE_LED_TOOLTIP, -1)
+
 class CLed : public wxWindow
 {
 public:
@@ -25 +30 @@
     DECLARE_EVENT_TABLE()
     void OnPaint(wxPaintEvent& event);
     void OnTimer(wxTimerEvent& event);
+    void OnEnterWindow(wxMouseEvent& event);
 #ifdef __WXMSW__
     void OnEraseBackground(wxEraseEvent& event);
 #endif

src/interface/Mainfrm.cpp

@@ -73 +73 @@
     EVT_SIZE(CMainFrame::OnSize)
     EVT_MENU(wxID_ANY, CMainFrame::OnMenuHandler)
     EVT_FZ_NOTIFICATION(wxID_ANY, CMainFrame::OnEngineEvent)
+    EVT_COMMAND(wxID_ANY, fzEVT_UPDATE_LED_TOOLTIP, CMainFrame::OnUpdateLedTooltip)
     EVT_TOOL(XRCID("ID_TOOLBAR_DISCONNECT"), CMainFrame::OnDisconnect)
     EVT_MENU(XRCID("ID_MENU_SERVER_DISCONNECT"), CMainFrame::OnDisconnect)
     EVT_TOOL(XRCID("ID_TOOLBAR_CANCEL"), CMainFrame::OnCancel)
@@ -1050 +1051 @@
     }
 }
 
+void CMainFrame::OnUpdateLedTooltip(wxCommandEvent& event)
+{
+    wxString tooltipText;
+
+    wxFileOffset downloadSpeed = m_pQueueView->GetCurrentDownloadSpeed();
+    wxFileOffset uploadSpeed = m_pQueueView->GetCurrentUploadSpeed();
+
+    CSizeFormat::_format format = static_cast<CSizeFormat::_format>(COptions::Get()->GetOptionVal(OPTION_SIZE_FORMAT));
+    if (format == CSizeFormat::bytes)
+        format = CSizeFormat::iec;
+
+    const wxString downloadSpeedStr = CSizeFormat::Format(downloadSpeed, true, format,
+                                                          COptions::Get()->GetOptionVal(OPTION_SIZE_USETHOUSANDSEP) != 0,
+                                                          COptions::Get()->GetOptionVal(OPTION_SIZE_DECIMALPLACES));
+    const wxString uploadSpeedStr = CSizeFormat::Format(uploadSpeed, true, format,
+                                                        COptions::Get()->GetOptionVal(OPTION_SIZE_USETHOUSANDSEP) != 0,
+                                                        COptions::Get()->GetOptionVal(OPTION_SIZE_DECIMALPLACES));
+    tooltipText.Printf(_("Download speed: %s/s\nUpload speed: %s/s"), downloadSpeedStr.c_str(), uploadSpeedStr.c_str());
+
+    m_pActivityLed[0]->SetToolTip(tooltipText);
+    m_pActivityLed[1]->SetToolTip(tooltipText);
+}
+
 bool CMainFrame::CreateToolBar()
 {
     if (m_pToolBar)

src/interface/Mainfrm.h

@@ -109 +109 @@
     void OnSize(wxSizeEvent& event);
     void OnMenuHandler(wxCommandEvent& event);
     void OnEngineEvent(wxEvent& event);
+    void OnUpdateLedTooltip(wxCommandEvent& event);
     void OnDisconnect(wxCommandEvent& event);
     void OnCancel(wxCommandEvent& event);
     void OnClose(wxCloseEvent& event);

src/interface/QueueView.cpp

@@ -3490 +3490 @@
     return result;
 }
 
+wxFileOffset CQueueView::GetCurrentDownloadSpeed(void)
+{
+    wxFileOffset speed = GetCurrentSpeed(true, false);
+    return speed;
+}
+
+wxFileOffset CQueueView::GetCurrentUploadSpeed(void)
+{
+    wxFileOffset speed = GetCurrentSpeed(false, true);
+    return speed;
+}
+
+wxFileOffset CQueueView::GetCurrentSpeed(bool countDownload, bool countUpload)
+{
+    wxFileOffset speed = 0;
+
+    for (std::list<CStatusLineCtrl*>::iterator iter = m_statusLineList.begin(); iter != m_statusLineList.end(); ++iter)
+    {
+        CStatusLineCtrl *pCtrl = *iter;
+        const CFileItem *pItem = pCtrl->GetItem();
+        bool isDownload = pItem->Download();
+
+        if ((isDownload && countDownload) || (!isDownload && countUpload))
+        {
+            speed += pCtrl->GetCurrentSpeed();
+        }
+    }
+
+    return speed;
+}
+
 void CQueueView::ReleaseExclusiveEngineLock(CFileZillaEngine* pEngine)
 {
     wxASSERT(pEngine);

src/interface/QueueView.h

@@ -143 +143 @@
 
     static wxString ReplaceInvalidCharacters(const wxString& filename);
 
+    // Get the current download speed as the sum of all active downloads.
+    // Unit is byte/s.
+    wxFileOffset GetCurrentDownloadSpeed(void);
+
+    // Get the current upload speed as the sum of all active uploads.
+    // Unit is byte/s.
+    wxFileOffset GetCurrentUploadSpeed(void);
+
 protected:
 
 #ifdef __WXMSW__
@@ -282 +290 @@
 
     CQueueStorage m_queue_storage;
 
+    // Get the current transfer speed.
+    // Unit is byte/s.
+    wxFileOffset GetCurrentSpeed(bool countDownload, bool countUpload);
+
     DECLARE_EVENT_TABLE();
     void OnEngineEvent(wxEvent &event);
     void OnFolderThreadComplete(wxCommandEvent& event);