* Added TextElementValue*.

* The curl perform loop wasn't properly checking the returned pointer, which caused a segfault with libcurl 7.15.5. git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@754 e378c898-3ddf-0310-93e7-cc216c733640
2026-10-06 22:29:23 +00:00 · 2006-08-10 21:24:10 +00:00
parent ca58b43d8b
commit 3c634730c4
13 changed files with 340 additions and 34 deletions
@@ -49,6 +49,7 @@
 #include "display/window_download_statusbar.h"

 #include "display/text_element_string.h"
+#include "display/text_element_value.h"

 #include "control.h"
 #include "download.h"
@@ -133,8 +134,17 @@ Download::create_info() {

  element->set_column(1);

-  element->push_column(new display::TextElementCString("Name:"),      display::text_element_string_slot(rak::on(std::mem_fun(&core::Download::c_download), std::mem_fun(&torrent::Download::name))));
-  element->push_column(new display::TextElementCString("Info Hash:"), display::text_element_string_slot(std::mem_fun(&core::Download::info_hash_hex)));
+  // Get these bindings with some kind of string map.
+
+  element->push_column("Name:",      display::text_element_string_slot(rak::on(std::mem_fun(&core::Download::c_download), std::mem_fun(&torrent::Download::name))));
+  element->push_column("Local Id:",  display::text_element_string_slot(std::mem_fun(&core::Download::local_id_escaped)));
+  element->push_column("Info Hash:", display::text_element_string_slot(std::mem_fun(&core::Download::info_hash_hex)));
+
+  element->push_back("");
+  element->push_column("Directory:",    display::text_element_string_slot(rak::on(std::mem_fun(&core::Download::file_list), std::mem_fun(&torrent::FileList::root_dir))));
+  element->push_column("Tied to File:", display::text_element_string_slot(rak::bind2nd(std::mem_fun(&core::Download::variable_string), "tied_to_file")));
+
+  element->push_column("Priority:",     display::text_element_value_slot(rak::bind2nd(std::mem_fun(&core::Download::variable_value), "priority")));

  element->set_column_width(element->column_width() + 1);

@@ -41,7 +41,6 @@
 #include "display/frame.h"
 #include "display/window_text.h"
 #include "display/text_element_list.h"
-#include "display/text_element_string.h"
 #include "input/manager.h"

 #include "control.h"
@@ -96,8 +95,8 @@ ElementText::disable() {
 }

 void
-ElementText::push_back(display::TextElement* entry) {
-  m_window->push_back(entry);
+ElementText::push_back(text_element_wrapper entry) {
+  m_window->push_back(entry.m_element);

  // For the moment, don't bother doing anything if the window is
  // already active.
@@ -105,15 +104,15 @@ ElementText::push_back(display::TextElement* entry) {
 }

 void
-ElementText::push_column(display::TextElement* entry1, display::TextElement* entry2) {
-  m_columnWidth = std::max(entry1->max_length(), m_column);
+ElementText::push_column(text_element_wrapper entry1, text_element_wrapper entry2) {
+  m_columnWidth = std::max(entry1.m_element->max_length(), m_columnWidth);

  display::TextElementList* list = new display::TextElementList;
  list->set_column(m_column);
  list->set_column_width(&m_columnWidth);

-  list->push_back(entry1);
-  list->push_back(entry2);
+  list->push_back(entry1.m_element);
+  list->push_back(entry2.m_element);

  push_back(list);
 }
@@ -0,0 +1,97 @@
+// rTorrent - BitTorrent client
+// Copyright (C) 2005-2006, Jari Sundell
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// In addition, as a special exception, the copyright holders give
+// permission to link the code of portions of this program with the
+// OpenSSL library under certain conditions as described in each
+// individual source file, and distribute linked combinations
+// including the two.
+//
+// You must obey the GNU General Public License in all respects for
+// all of the code used other than OpenSSL.  If you modify file(s)
+// with this exception, you may extend this exception to your version
+// of the file(s), but you are not obligated to do so.  If you do not
+// wish to do so, delete this exception statement from your version.
+// If you delete this exception statement from all source files in the
+// program, then also delete it here.
+//
+// Contact:  Jari Sundell <jaris@ifi.uio.no>
+//
+//           Skomakerveien 33
+//           3185 Skoppum, NORWAY
+
+#ifndef RTORRENT_UI_ELEMENT_TEXT_H
+#define RTORRENT_UI_ELEMENT_TEXT_H
+
+#include <sigc++/slot.h>
+
+#include "core/download.h"
+#include "display/text_element_string.h"
+
+#include "element_base.h"
+
+namespace display {
+  class WindowText;
+  class TextElement;
+}
+
+namespace ui {
+
+struct text_element_wrapper;
+
+class ElementText : public ElementBase {
+public:
+  typedef display::WindowText         WindowText;
+
+  typedef uint32_t                    size_type;
+  typedef uint32_t                    extent_type;
+
+  ElementText(void *object);
+  ~ElementText();
+
+  void                activate(display::Frame* frame, bool focus = false);
+  void                disable();
+
+  // Consider returning a pointer that can be used to manipulate
+  // entries, f.ex disabling them.
+
+  void                push_back(text_element_wrapper entry);
+
+  void                push_column(text_element_wrapper entry1, text_element_wrapper entry2);
+
+  void                set_column(unsigned int column)     { m_column = column; }
+
+  extent_type         column_width() const                { return m_columnWidth; }
+  void                set_column_width(extent_type width) { m_columnWidth = width; }
+
+private:
+  WindowText*         m_window;
+
+  unsigned int        m_column;
+  extent_type         m_columnWidth;
+};
+
+struct text_element_wrapper {
+  text_element_wrapper(const char* cstr) : m_element(new display::TextElementCString(cstr)) {}
+  text_element_wrapper(display::TextElement* element) : m_element(element) {}
+
+  display::TextElement* m_element;
+};  
+
+}
+
+#endif