* Bump to version 0.11.2/0.7.2.

* Allow the user to collapse the directories with the '/' key.

* Cleanup of core::Manager::receive_hashing_changed().


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@841 e378c898-3ddf-0310-93e7-cc216c733640

src/ui/element_file_list.cc

@@ -62,13 +62,15 @@ ElementFileList::ElementFileList(core::Download* d) :
   m_window(NULL),
   m_elementInfo(NULL),
 
-  m_selected(iterator(d->download()->file_list()->begin())) {
+  m_selected(iterator(d->download()->file_list()->begin())),
+  m_collapsed(false) {
 
   m_bindings[KEY_LEFT] = m_bindings['B' - '@']  = sigc::mem_fun(&m_slotExit, &slot_type::operator());
-  m_bindings[KEY_RIGHT] = m_bindings['F' - '@'] = sigc::bind(sigc::mem_fun(this, &ElementFileList::activate_display), DISPLAY_INFO);
+  m_bindings[KEY_RIGHT] = m_bindings['F' - '@'] = sigc::mem_fun(*this, &ElementFileList::receive_select);
 
   m_bindings[' '] = sigc::mem_fun(*this, &ElementFileList::receive_priority);
   m_bindings['*'] = sigc::mem_fun(*this, &ElementFileList::receive_change_all);
+  m_bindings['/'] = sigc::mem_fun(*this, &ElementFileList::receive_collapse);
   m_bindings[KEY_NPAGE] = sigc::mem_fun(*this, &ElementFileList::receive_pagenext);
   m_bindings[KEY_PPAGE] = sigc::mem_fun(*this, &ElementFileList::receive_pageprev);
 
@@ -119,7 +121,7 @@ ElementFileList::activate(display::Frame* frame, bool focus) {
   if (focus)
     control->input()->push_back(&m_bindings);
 
-  m_window = new WFileList(m_download, &m_selected);
+  m_window = new WFileList(this);
   m_window->set_active(true);
   m_window->set_focused(focus);
 
@@ -193,7 +195,12 @@ void
 ElementFileList::receive_next() {
   torrent::FileList* fl = m_download->download()->file_list();
 
-  if (m_selected == iterator(fl->end()) || ++m_selected == iterator(fl->end()))
+  if (is_collapsed())
+    m_selected.forward_current_depth();
+  else
+    m_selected++;
+
+  if (m_selected == iterator(fl->end()))
     m_selected = iterator(fl->begin());
 
   update_itr();
@@ -206,7 +213,11 @@ ElementFileList::receive_prev() {
   if (m_selected == iterator(fl->begin()))
     m_selected = iterator(fl->end());
 
-  m_selected--;
+  if (is_collapsed())
+    m_selected.backward_current_depth();
+  else
+    m_selected--;
+
   update_itr();
 }
 
@@ -230,7 +241,7 @@ ElementFileList::receive_pagenext() {
 void
 ElementFileList::receive_pageprev() {
   if (m_window == NULL)
-    throw torrent::internal_error("ui::ElementFileList::receive_pageprev(...) called on a disabled object");
+    return;
 
   torrent::FileList* fl = m_download->download()->file_list();
 
@@ -242,33 +253,29 @@ ElementFileList::receive_pageprev() {
   update_itr();
 }
 
-// Take a range as input and return the next entry at the same
-// directory depth as first. If the returned iterator equals 'last' or
-// is_leaving() == true then the search failed. UHM... wrong...
+void
+ElementFileList::receive_select() {
+  if (m_window == NULL || m_state != DISPLAY_LIST)
+    return;
 
-torrent::FileListIterator
-next_current_depth(torrent::FileListIterator first, torrent::FileListIterator last) {
-  if (first == last)
-    return first;
-
-  uint32_t depth = (first++).depth();
-
-  while (first != last && (first.depth() > depth || first.is_leaving()))
-    ++first;
-
-  return first;
+  if (is_collapsed() && !m_selected.is_file()) {
+    m_selected++;
+    m_window->mark_dirty();
+  } else {
+    activate_display(DISPLAY_INFO);
+  }
 }
 
 void
 ElementFileList::receive_priority() {
   if (m_window == NULL)
-    throw torrent::internal_error("ui::ElementFileList::receive_prev(...) called on a disabled object");
+    return;
 
-  torrent::FileList* fl = m_download->download()->file_list();
   torrent::priority_t priority = torrent::priority_t((m_selected.file()->priority() + 2) % 3);
 
   iterator first = m_selected; 
-  iterator last = next_current_depth(m_selected, iterator(fl->end()));
+  iterator last = m_selected;
+  last.forward_current_depth();
 
   while (first != last) {
     if (first.is_file())
@@ -284,7 +291,7 @@ ElementFileList::receive_priority() {
 void
 ElementFileList::receive_change_all() {
   if (m_window == NULL)
-    throw torrent::internal_error("ui::ElementFileList::receive_prev(...) called on a disabled object");
+    return;
 
   torrent::FileList* fl = m_download->download()->file_list();
   torrent::priority_t priority = torrent::priority_t((m_selected.file()->priority() + 2) % 3);
@@ -296,6 +303,15 @@ ElementFileList::receive_change_all() {
   update_itr();
 }
 
+void
+ElementFileList::receive_collapse() {
+  if (m_window == NULL)
+    return;
+
+  set_collapsed(!is_collapsed());
+  m_window->mark_dirty();
+}
+
 void
 ElementFileList::update_itr() {
   m_window->mark_dirty();

src/ui/element_file_list.h

@@ -44,8 +44,6 @@
 
 #include "element_base.h"
 
-class Control;
-
 namespace display {
   class WindowFileList;
 }
@@ -72,14 +70,23 @@ public:
 
   void                activate_display(Display display);
 
+  bool                is_collapsed() const  { return m_collapsed; }
+  void                set_collapsed(bool s) { m_collapsed = s; }
+
+  iterator            selected() const      { return m_selected; }
+  core::Download*     download() const      { return m_download; }
+
 private:
   void                receive_next();
   void                receive_prev();
   void                receive_pagenext();
   void                receive_pageprev();
 
+  void                receive_select();
+
   void                receive_priority();
   void                receive_change_all();
+  void                receive_collapse();
 
   void                update_itr();
 
@@ -91,6 +98,7 @@ private:
   
   // Change to unsigned, please.
   iterator            m_selected;
+  bool                m_collapsed;
 };
 
 }