Changeset 2469

Timestamp:

Jul 23, 2007, 9:01:26 PM (16 years ago)

Author:

charles

Message:

torrent filter counts work now.

Location:

trunk/wx

Files:

• Makefile.am (modified) (1 diff)
• torrent-filter.cc (added)
• torrent-filter.h (added)
• torrent-list.cc (modified) (5 diffs)
• torrent-list.h (modified) (3 diffs)
• xmission.cc (modified) (10 diffs)

trunk/wx/Makefile.am

@@ -5 +5 @@
 bin_PROGRAMS = Xmission
 
-Xmission_SOURCES = xmission.cc torrent-list.cc
+Xmission_SOURCES = \
+    xmission.cc \
+    torrent-filter.cc \
+    torrent-list.cc
 
 Xmission_LDADD = ../libtransmission/libtransmission.a @WX_LIBS@ $(PTHREAD_LIBS) -lm

trunk/wx/torrent-list.cc

@@ -166 +166 @@
 
 BEGIN_EVENT_TABLE(TorrentListCtrl, wxListCtrl)
-    EVT_LIST_COL_CLICK(TORRENT_LIST_CTRL, TorrentListCtrl::OnSort)
+    EVT_LIST_COL_CLICK( TORRENT_LIST_CTRL, TorrentListCtrl::OnSort )
+    EVT_LIST_ITEM_SELECTED( TORRENT_LIST_CTRL, TorrentListCtrl::OnItemSelected )
+    EVT_LIST_ITEM_DESELECTED( TORRENT_LIST_CTRL, TorrentListCtrl::OnItemDeselected )
 END_EVENT_TABLE()
 
@@ -174 +176 @@
                                     const wxPoint     & pos,
                                     const wxSize      & size):
-    wxListCtrl( parent, TORRENT_LIST_CTRL, pos, size, wxLC_REPORT|wxLC_SINGLE_SEL ),
+    wxListCtrl( parent, TORRENT_LIST_CTRL, pos, size, wxLC_REPORT ),
     myHandle( handle ),
     myConfig( config )
@@ -318 +320 @@
 }
 
+/***
+****
+***/
+
+void
+TorrentListCtrl :: OnSort( wxListEvent& event )
+{
+    const int_v  cols = getTorrentColumns( myConfig );
+    const int key = cols[ event.GetColumn() ];
+    Sort( key );
+}
+
+void
+TorrentListCtrl :: OnItemSelected( wxListEvent& event )
+{
+    std::set<tr_torrent_t*> sel;
+    long item = -1;
+    for ( ;; ) {
+        item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+        if ( item == -1 )
+            break;
+        sel.insert( myTorrents[GetItemData(item)] );
+    }
+    fire_selection_changed( sel );
+}
+
+void
+TorrentListCtrl :: OnItemDeselected( wxListEvent& event )
+{
+    OnItemSelected( event );
+}
+
+/***
+****
+***/
+
 static torrents_t * uglyHack = NULL;
 
@@ -414 +452 @@
 
     return ret;
-}
-
-void
-TorrentListCtrl :: OnSort( wxListEvent& event )
-{
-    const int_v  cols = getTorrentColumns( myConfig );
-    const int key = cols[ event.GetColumn() ];
-    Sort( key );
 }
 
@@ -453 +483 @@
     uglyHack = NULL;
 }
+
+/***
+****
+***/
 
 void

trunk/wx/torrent-list.h

@@ -30 +30 @@
 
     public:
+
+        enum ShowMode
+        {
+            SHOW_ALL,
+            SHOW_DOWNLOADING,
+            SHOW_UPLOADING,
+            SHOW_COMPLETE,
+            SHOW_INCOMPLETE,
+            SHOW_ACTIVE,
+            SHOW_INACTIVE,
+            N_FILTERS
+        };
+
+        void SetShowMode( ShowMode );
+
+        int GetShowModeCounts( ShowMode ) const;
+
+    public:
+
+        struct Listener
+        {
+            Listener() {}
+
+            virtual ~Listener() {}
+
+            virtual void OnTorrentListSelectionChanged(
+                TorrentListCtrl*,
+                const std::set<tr_torrent_t*>& ) = 0;
+        };
+
+    private:
+        typedef std::set<Listener*> listeners_t;
+        listeners_t myListeners;
+        void fire_selection_changed( const std::set<tr_torrent_t*>& t ) {
+            for( listeners_t::iterator it(myListeners.begin()), end(myListeners.end()); it!=end; )
+                (*it++)->OnTorrentListSelectionChanged( this, t );
+        }
+    public:
+        void AddListener( Listener* l ) { myListeners.insert(l); }
+        void RemoveListener( Listener* l ) { myListeners.erase(l); }
+
+    public:
         void Rebuild ();
         void Repopulate ();
@@ -41 +83 @@
         void Sort( int column );
         void Resort( );
-        void OnSort( wxListEvent& );
         void RefreshTorrent( tr_torrent_t*, int, const std::vector<int>& );
         static int Compare( long, long, long );
@@ -48 +89 @@
         typedef std::map<std::string,int> str2int_t;
         str2int_t myHashToRow;
+
+    private:
+        void OnSort( wxListEvent& );
+        void OnItemSelected( wxListEvent& );
+        void OnItemDeselected( wxListEvent& );
 
     private:

trunk/wx/xmission.cc

@@ -20 +20 @@
 #include <wx/config.h>
 #include <wx/image.h>
+#include <wx/intl.h>
 #include <wx/listctrl.h>
 #include <wx/notebook.h>
@@ -43 +44 @@
 }
 
+#include "torrent-filter.h"
 #include "torrent-list.h"
 
@@ -56 +58 @@
     tr_handle_t * handle = NULL;
 
-    typedef std::vector<tr_torrent_t*> torrents_t;
+    typedef std::vector<tr_torrent_t*> torrents_v;
 }
 
@@ -64 +66 @@
     MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
     virtual ~MyFrame();
+
+public:
     void OnQuit( wxCommandEvent& );
     void OnAbout( wxCommandEvent& );
@@ -69 +73 @@
     void OnTimer( wxTimerEvent& );
 
+private:
+    void RefreshFilterCounts( );
+
 protected:
     wxConfig * myConfig;
@@ -75 +82 @@
 private:
     TorrentListCtrl * myTorrentList;
+    wxListCtrl * myFilters;
     wxTaskBarIcon * myTaskBarIcon;
     wxIcon * myLogoIcon;
     wxIcon * myTrayLogo;
+    torrents_v myTorrents;
 };
 
@@ -181 +190 @@
 
 void
+MyFrame :: RefreshFilterCounts( )
+{
+    for( int i=0; i<TorrentFilter::N_FILTERS; ++i )
+    {
+        wxString xstr = TorrentFilter::getFilterName( i );
+        const int count = TorrentFilter::CountHits( i, myTorrents );
+        if( count )
+            xstr += wxString::Format(_T(" (%d)"), count );
+        myFilters->SetItem( i, 0, xstr );
+    }
+}
+
+void
 MyFrame :: OnTimer(wxTimerEvent& event)
 {
-    myTorrentList->Refresh ();
+    RefreshFilterCounts( );
+
+    myTorrentList->Refresh ( );
 
     float dl, ul;
@@ -287 +311 @@
     /* Filters */
 
-    wxListCtrl * filters = new wxListCtrl( row1, wxID_ANY, wxDefaultPosition, wxDefaultSize,
-                                           wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_NO_HEADER );
-    filters->InsertColumn( wxLIST_FORMAT_LEFT, _T("YYZ") );
-    int i = 0;
-    filters->InsertItem( i++, _T("All") );
-    filters->InsertItem( i++, _T("Downloading (1)") );
-    filters->InsertItem( i++, _T("Completed") );
-    filters->InsertItem( i++, _T("Active (1)") );
-    filters->InsertItem( i++, _T("Inactive") );
+    myFilters = new wxListCtrl( row1, wxID_ANY, wxDefaultPosition, wxSize(120,-1),
+                                wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_NO_HEADER );
+    myFilters->InsertColumn( wxLIST_FORMAT_LEFT, _("Filters"), wxLIST_FORMAT_LEFT, 120 );
+    for( int i=0; i<TorrentFilter::N_FILTERS; ++i )
+        myFilters->InsertItem( i, TorrentFilter::getFilterName(i) );
 
     /* Torrent List */
@@ -302 +322 @@
 
     wxBoxSizer * boxSizer = new wxBoxSizer( wxHORIZONTAL );
-    boxSizer->Add( filters, 0, wxEXPAND|wxRIGHT, 5 );
+    boxSizer->Add( myFilters, 0, wxEXPAND|wxRIGHT, 5 );
     boxSizer->Add( myTorrentList, 1, wxEXPAND, 0 );
     row1->SetSizer( boxSizer );
+    //boxSizer->SetSizeHints( row1 );
 
 
@@ -344 +365 @@
     int count = 0;
     tr_torrent_t ** torrents = tr_loadTorrents ( handle, destination, flags, &count );
-    myTorrentList->Add( std::vector<tr_torrent_t*>( torrents, torrents+count ) );
+    myTorrents.insert( myTorrents.end(), torrents, torrents+count );
+    myTorrentList->Add( myTorrents );
     tr_free( torrents );
 }