Changeset 306

Timestamp:

09/24/07 15:26:10 (13 years ago)

Author:

Eoin

Message:

 

Location:

src

Files:

• HaliteDialog.cpp (modified) (3 diffs)
• HaliteDialog.hpp (modified) (1 diff)
• HaliteDialogBase.hpp (modified) (3 diffs)
• HaliteWindow.hpp (modified) (1 diff)
• advtabs/Files.cpp (modified) (3 diffs)
• advtabs/Files.hpp (modified) (2 diffs)
• advtabs/Torrent.cpp (modified) (4 diffs)
• advtabs/Torrent.hpp (modified) (1 diff)

src/HaliteDialog.cpp

@@ -172 +172 @@
 }
 
-void HaliteDialog::focusChanged(string& torrent_name) 
+void HaliteDialog::focusChanged(const hal::TorrentDetail_ptr pT)
 {
         pair<float, float> tranLimit(-1.0, -1.0);
         pair<int, int> connLimit(-1, -1);
         
-        if (hal::bittorrent().isTorrent(torrent_name))
-        {
-                tranLimit = hal::bittorrent().getTorrentSpeed(torrent_name);
-                connLimit = hal::bittorrent().getTorrentLimit(torrent_name);
-                
-                if (!hal::bittorrent().isTorrentActive(torrent_name))
+        if (pT)
+        {
+                tranLimit = hal::bittorrent().getTorrentSpeed(pT->name());
+                connLimit = hal::bittorrent().getTorrentLimit(pT->name());
+                
+                if (!hal::bittorrent().isTorrentActive(pT->name()))
                         SetDlgItemText(BTNPAUSE, L"Resume");
                 else            
@@ -236 +236 @@
                 string torrent_name = hal::to_utf8(torrent->name());
                 
-                if (current_torrent_name_ != torrent_name)
-                {       
-                        current_torrent_name_ = torrent_name;
-                        focusChanged(current_torrent_name_);
-                }       
-                
                 SetDlgItemText(IDC_NAME, torrent->name().c_str());
                 SetDlgItemText(IDC_TRACKER, torrent->currentTracker().c_str());
@@ -266 +260 @@
                 m_list.uiUpdate(tD);
         }
-        else
-        {       
-                if (current_torrent_name_ != "")
-                {       
-                        current_torrent_name_ = "";
-                        focusChanged(current_torrent_name_);
-                }       
-        }
-}
+}

src/HaliteDialog.hpp

@@ -208 +208 @@
         
         void uiUpdate(const hal::TorrentDetails& allTorrents); 
-        void focusChanged(string& torrent_name);
+        void focusChanged(const hal::TorrentDetail_ptr pT);
         
 protected:

src/HaliteDialogBase.hpp

@@ -24 +24 @@
                 haliteWindow_(haliteWindow)
         {               
-                connection_ = haliteWindow.connectUiUpdate(bind(&TBase::uiUpdate, static_cast<TBase*>(this), _1));
+                connection_ = haliteWindow.connectUiUpdate(bind(&thisClass::handleUiUpdate, this, _1));
+        }
+
+        BEGIN_MSG_MAP_EX(thisClass)
+                MSG_WM_SHOWWINDOW(OnShow)
+//              REFLECT_NOTIFICATIONS()
+        END_MSG_MAP()
+        
+        void OnShow(bool show, int flags)
+        {
+                if (show)
+                {
+                        hal::event().post(shared_ptr<hal::EventDetail>(
+                                new hal::EventMsg(L"True")));
+                        connection_.unblock();
+                }
+                else
+                {
+                        hal::event().post(shared_ptr<hal::EventDetail>(
+                                new hal::EventMsg(L"False")));
+                        connection_.block();
+                }
         }
         
@@ -41 +62 @@
         
         void uiUpdate(const hal::TorrentDetails& tD)
+        {}      
+        
+        void handleUiUpdate(const hal::TorrentDetails& tD)
+        {
+                TBase* pT = static_cast<TBase*>(this);
+                wstring torrent_name = L"";
+                
+                if (hal::TorrentDetail_ptr torrent = tD.selectedTorrent())      
+                        torrent_name = torrent->filename();
+                
+                if (current_torrent_name_ != torrent_name)
+                {       
+                        current_torrent_name_ = torrent_name;
+                        pT->focusChanged(tD.focusedTorrent());
+                }
+        
+                pT->uiUpdate(tD);
+        }
+
+        void focusChanged(const hal::TorrentDetail_ptr pT)
         {}
         
@@ -53 +94 @@
         
 protected:
+        wstring current_torrent_name_;
 
 private:

src/HaliteWindow.hpp

@@ -182 +182 @@
                 ar & BOOST_SERIALIZATION_NVP(activeTab);
         }
-                
+        
         friend class GeneralOptions;
 

src/advtabs/Files.cpp

@@ -224 +224 @@
         hal::event().post(shared_ptr<hal::EventDetail>(new hal::EventDebug(hal::Event::info, (wformat(L"doUiUpdate %1%") % current_torrent_name_).str().c_str())));
 
-        current_torrent_name_ = L"";
+        focusChanged(hal::bittorrent().torrentDetails().focusedTorrent());
         uiUpdate(hal::bittorrent().torrentDetails());
 }
@@ -230 +230 @@
 void AdvFilesDialog::uiUpdate(const hal::TorrentDetails& tD)
 {
-        wstring torrent_name = L"";
-        
-        if (hal::TorrentDetail_ptr torrent = tD.selectedTorrent())      
-                torrent_name = torrent->filename();
-        
-//      hal::event().post(shared_ptr<hal::EventDetail>(new hal::EventDebug(hal::Event::info, (wformat(L"uiUpdate %1%, %2%") % current_torrent_name_ % torrent_name).str().c_str())));
-        
-        if (current_torrent_name_ != torrent_name)
-        {       
-                focusChanged(torrent_name);
-        }
-        
         if (fileDetails_.empty()) return;
         
@@ -297 +285 @@
 }
 
-void AdvFilesDialog::focusChanged(wstring& torrent_name)
-{
-        hal::event().post(shared_ptr<hal::EventDetail>(new hal::EventDebug(hal::Event::info, (wformat(L"focusChanged %1%, %2% : %3%") % current_torrent_name_ % torrent_name % tree_.focused()).str().c_str())));
-
-        current_torrent_name_ = torrent_name;
-        
-        const hal::TorrentDetails& tD = hal::bittorrent().torrentDetails();
-        
+void AdvFilesDialog::focusChanged(const hal::TorrentDetail_ptr pT)
+{
         fileDetails_.clear();
-//      foreach (const hal::TorrentDetail_ptr torrent, tD.selectedTorrents())
-        if (hal::TorrentDetail_ptr torrent = tD.focusedTorrent())
-        {
-                std::copy(torrent->fileDetails().begin(), torrent->fileDetails().end(), 
+        if (pT)
+        {
+                std::copy(pT->fileDetails().begin(), pT->fileDetails().end(), 
                         std::back_inserter(fileDetails_));
         }
         
-        list_.setFocused(tD.focusedTorrent());
+        list_.setFocused(pT);
         
         std::sort(fileDetails_.begin(), fileDetails_.end());

src/advtabs/Files.hpp

@@ -354 +354 @@
                         if (PreTranslateMessage((LPMSG)lParam)) return TRUE;
                 
+                CHAIN_MSG_MAP(dialogBaseClass)
                 CHAIN_MSG_MAP(resizeClass)
                 CHAIN_MSG_MAP(baseClass)
@@ -376 +377 @@
         void doUiUpdate();
         void uiUpdate(const hal::TorrentDetails& tD);
-        void focusChanged(wstring& torrent_name);
+        void focusChanged(const hal::TorrentDetail_ptr pT);
 
 protected:

src/advtabs/Torrent.cpp

@@ -57 +57 @@
 }
 
-void AdvTorrentDialog::focusChanged(string& torrent_name) 
+void AdvTorrentDialog::focusChanged(const hal::TorrentDetail_ptr pT)
 {
         pair<float, float> tranLimit(-1.0, -1.0);
@@ -63 +63 @@
         float ratio = 0;
 
-        if (hal::bittorrent().isTorrent(torrent_name))
+        if (pT)
         {
-                tranLimit = hal::bittorrent().getTorrentSpeed(torrent_name);
-                connLimit = hal::bittorrent().getTorrentLimit(torrent_name);
+                tranLimit = hal::bittorrent().getTorrentSpeed(pT->name());
+                connLimit = hal::bittorrent().getTorrentLimit(pT->name());
                 
-                ratio = hal::bittorrent().getTorrentRatio(torrent_name);
+                ratio = hal::bittorrent().getTorrentRatio(pT->name());
                 
                 ::EnableWindow(GetDlgItem(IDC_EDITTLD), true);
@@ -110 +110 @@
 void AdvTorrentDialog::uiUpdate(const hal::TorrentDetails& tD)
 {       
-        if (hal::TorrentDetail_ptr torrent = tD.selectedTorrent())      
-        {       
-                string torrent_name = hal::to_utf8(torrent->filename());
-                
-                if (current_torrent_name_ != torrent_name)
-                {       
-                        current_torrent_name_ = torrent_name;
-                        focusChanged(current_torrent_name_);
-                }
-                
-                uiUpdateSingle(tD.selectedTorrent());   
-        }
-        else
-        {       
-                if (current_torrent_name_ != "")
-                {       
-                        current_torrent_name_ = "";
-                        focusChanged(current_torrent_name_);
-                }       
+        if (hal::TorrentDetail_ptr torrent = tD.focusedTorrent())       
+        {                       
+                uiUpdateSingle(torrent);        
         }
 }
@@ -142 +126 @@
                 HAL_RATE                          "Downloading at %1$.2fkb/s, Uploading at %2$.2fkb/s, Ratio %3$.2f."
 */      
-
                 SetDlgItemInfo(IDC_NAME_STATUS, 
                         wformat(hal::app().res_wstr(HAL_NAME_STATUS)) 

src/advtabs/Torrent.hpp

@@ -135 +135 @@
         void uiUpdateSingle(const hal::TorrentDetail_ptr& torrent);
         void uiUpdateNone();
-        void focusChanged(string& torrent_name);
+        void focusChanged(const hal::TorrentDetail_ptr pT);
 
 protected: