Changeset 617 for trunk

Timestamp:

11/03/08 19:07:16 (11 years ago)

Author:

Eoin

Message:

Queue management fully linked up.

Location:

trunk

Files:

• Halite.sln (modified) (1 diff)
• src/HaliteListView.cpp (modified) (3 diffs)
• src/HaliteListView.hpp (modified) (2 diffs)
• src/halTorrent.hpp (modified) (2 diffs)

trunk/Halite.sln

@@ -18 +18 @@
         EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2DE93320-DEB5-4CB1-AB8C-17875DFF3184}"
+        ProjectSection(SolutionItems) = preProject
+                Halite.vsmdi = Halite.vsmdi
+                LocalTestRun.testrunconfig = LocalTestRun.testrunconfig
+        EndProjectSection
+EndProject
 Global
+        GlobalSection(TestCaseManagementSettings) = postSolution
+                CategoryFile = Halite.vsmdi
+        EndGlobalSection
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
                 Debug|Mixed Platforms = Debug|Mixed Platforms

trunk/src/HaliteListView.cpp

@@ -48 +48 @@
                 AddColumn(names[i].c_str(), i, visible[i], widths[i]);
         }       
-
-
-
 
         SafeLoadFromIni();
@@ -335 +332 @@
 }
 
+LRESULT HaliteListViewCtrl::OnSetManaged(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
+{
+        foreach(const list_value_type val, std::make_pair(is_selected_begin(), is_selected_end()))
+        {
+                hal::bittorrent().get(std::wstring(winstl::c_str_ptr(val))).managed = true;
+        }
+        DeleteAllItems();
+        halWindow_.issueUiUpdate();
+
+        return 0;
+}
+
+LRESULT HaliteListViewCtrl::OnSetUnmanaged(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
+{
+        foreach(const list_value_type val, std::make_pair(is_selected_begin(), is_selected_end()))
+        {
+                hal::bittorrent().get(std::wstring(winstl::c_str_ptr(val))).managed = false;
+        }
+        DeleteAllItems();
+        halWindow_.issueUiUpdate();
+
+        return 0;
+}
+
+LRESULT HaliteListViewCtrl::OnAdjustQueuePosition(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
+{
+        foreach(const list_value_type val, std::make_pair(is_selected_begin(), is_selected_end()))
+        {
+                hal::bit::torrent t = hal::bittorrent().get(std::wstring(winstl::c_str_ptr(val)));
+
+                switch (wID)
+                {
+                case HAL_QUEUE_MOVE_TOP:
+                        t.adjust_queue_position(hal::bit::move_to_top);
+                        break;
+                case HAL_QUEUE_MOVE_UP:
+                        t.adjust_queue_position(hal::bit::move_up);             
+                        break;
+                case HAL_QUEUE_MOVE_DOWN:
+                        t.adjust_queue_position(hal::bit::move_down);           
+                        break;
+                case HAL_QUEUE_MOVE_BOTTOM:
+                        t.adjust_queue_position(hal::bit::move_to_bottom);              
+                        break;
+                };
+        }
+        
+        return 0;
+}
+
 LRESULT HaliteListViewCtrl::OnQueueView(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
 {
@@ -389 +436 @@
                 int ret = EnableGroupView(false);
         }
+        halWindow_.issueUiUpdate();
 
         MENUITEMINFO minfo = {sizeof(MENUITEMINFO)};

trunk/src/HaliteListView.hpp

@@ -393 +393 @@
                 COMMAND_ID_HANDLER(ID_LVM_EDIT_FOLDERS, OnEditFolders)
 
+                COMMAND_ID_HANDLER(HAL_AUTO_MANAGED, OnSetManaged)
+                COMMAND_ID_HANDLER(HAL_UNMANAGED, OnSetUnmanaged)
+                COMMAND_RANGE_HANDLER(HAL_QUEUE_MOVE_TOP, HAL_QUEUE_MOVE_BOTTOM, OnAdjustQueuePosition)
                 COMMAND_ID_HANDLER(HAL_LVM_QUEUE_VIEW, OnQueueView)
 
@@ -417 +420 @@
         LRESULT OnDownloadFolder(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
         LRESULT OnEditFolders(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
+
+        LRESULT OnSetManaged(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
+        LRESULT OnSetUnmanaged(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
+        LRESULT OnAdjustQueuePosition(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
         LRESULT OnQueueView(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
 

trunk/src/halTorrent.hpp

@@ -792 +792 @@
                         return torrent();
         }       
+
+        torrent get_wstr(const std::wstring& filename);
         
         bool listen_on(std::pair<int, int> const& portRange);
@@ -886 +888 @@
         bit();
         boost::scoped_ptr<bit_impl> pimpl;
-
-        torrent get_wstr(const std::wstring& filename);
         
         void remove_torrent_wstr(const std::wstring& filename);