Changeset 8216

Timestamp:

Apr 11, 2009, 6:25:12 PM (14 years ago)

Author:

charles

Message:

(qt) better integration of sort & filter modes into the preferences mechanism

Location:

trunk/qt

Files:

• filters.cc (added)
• filters.h (added)
• mainwin.cc (modified) (8 diffs)
• mainwin.h (modified) (2 diffs)
• prefs-dialog.cc (modified) (1 diff)
• prefs.cc (modified) (5 diffs)
• prefs.h (modified) (4 diffs)
• qtransmission.pro (modified) (2 diffs)
• session.cc (modified) (1 diff)
• torrent-filter.cc (modified) (7 diffs)
• torrent-filter.h (modified) (3 diffs)
• types.h (modified) (1 diff)

trunk/qt/mainwin.cc

@@ -22 +22 @@
 #include <QSystemTrayIcon>
 #include <QUrl>
+#include <QSignalMapper>
 
 #include "about.h"
 #include "details.h"
+#include "filters.h"
 #include "mainwin.h"
 #include "make-dialog.h"
@@ -140 +142 @@
 
     // ui signals
-    // ccc
     connect( ui.action_Toolbar, SIGNAL(toggled(bool)), this, SLOT(setToolbarVisible(bool)));
     connect( ui.action_TrayIcon, SIGNAL(toggled(bool)), this, SLOT(setTrayIconVisible(bool)));
@@ -146 +147 @@
     connect( ui.action_Statusbar, SIGNAL(toggled(bool)), this, SLOT(setStatusbarVisible(bool)));
     connect( ui.action_MinimalView, SIGNAL(toggled(bool)), this, SLOT(setMinimalView(bool)));
-    connect( ui.action_SortByActivity, SIGNAL(toggled(bool)), &myFilterModel, SLOT(sortByActivity()) );
-    connect( ui.action_SortByAge, SIGNAL(toggled(bool)), &myFilterModel, SLOT(sortByAge()) );
-    connect( ui.action_SortByETA, SIGNAL(toggled(bool)), &myFilterModel, SLOT(sortByETA()));
-    connect( ui.action_SortByName, SIGNAL(toggled(bool)), &myFilterModel, SLOT(sortByName()));
-    connect( ui.action_SortByProgress, SIGNAL(toggled(bool)), &myFilterModel, SLOT(sortByProgress()));
-    connect( ui.action_SortByRatio, SIGNAL(toggled(bool)), &myFilterModel, SLOT(sortByRatio()));
-    connect( ui.action_SortBySize, SIGNAL(toggled(bool)), &myFilterModel, SLOT(sortBySize()));
-    connect( ui.action_SortByState, SIGNAL(toggled(bool)), &myFilterModel, SLOT(sortByState()));
-    connect( ui.action_SortByTracker, SIGNAL(toggled(bool)), &myFilterModel, SLOT(sortByTracker()));
-    connect( ui.action_ReverseSortOrder, SIGNAL(toggled(bool)), &myFilterModel, SLOT(setAscending(bool)));
+    connect( ui.action_SortByActivity, SIGNAL(toggled(bool)), this, SLOT(onSortByActivityToggled(bool)));
+    connect( ui.action_SortByAge,      SIGNAL(toggled(bool)), this, SLOT(onSortByAgeToggled(bool)));
+    connect( ui.action_SortByETA,      SIGNAL(toggled(bool)), this, SLOT(onSortByETAToggled(bool)));
+    connect( ui.action_SortByName,     SIGNAL(toggled(bool)), this, SLOT(onSortByNameToggled(bool)));
+    connect( ui.action_SortByProgress, SIGNAL(toggled(bool)), this, SLOT(onSortByProgressToggled(bool)));
+    connect( ui.action_SortByRatio,    SIGNAL(toggled(bool)), this, SLOT(onSortByRatioToggled(bool)));
+    connect( ui.action_SortBySize,     SIGNAL(toggled(bool)), this, SLOT(onSortBySizeToggled(bool)));
+    connect( ui.action_SortByState,    SIGNAL(toggled(bool)), this, SLOT(onSortByStateToggled(bool)));
+    connect( ui.action_SortByTracker,  SIGNAL(toggled(bool)), this, SLOT(onSortByTrackerToggled(bool)));
+    connect( ui.action_ReverseSortOrder, SIGNAL(toggled(bool)), this, SLOT(setSortAscendingPref(bool)));
     connect( ui.action_Start, SIGNAL(triggered()), this, SLOT(startSelected()));
     connect( ui.action_Pause, SIGNAL(triggered()), this, SLOT(pauseSelected()));
@@ -205 +206 @@
     setTextButtonSizeHint( ui.filterSeeding );
     setTextButtonSizeHint( ui.filterPaused );
-    setShowMode( myFilterModel.getShowMode( ) );
 
     connect( &myFilterModel, SIGNAL(rowsInserted(const QModelIndex&,int,int)), this, SLOT(refreshVisibleCount()));
@@ -321 +321 @@
 
 void
+TrMainWindow :: setSortPref( int i )
+{
+    myPrefs.set( Prefs::SORT_MODE, SortMode( i ) );
+}
+void TrMainWindow :: onSortByActivityToggled ( bool b ) { if( b ) setSortPref( SortMode::SORT_BY_ACTIVITY ); }
+void TrMainWindow :: onSortByAgeToggled      ( bool b ) { if( b ) setSortPref( SortMode::SORT_BY_AGE );      }
+void TrMainWindow :: onSortByETAToggled      ( bool b ) { if( b ) setSortPref( SortMode::SORT_BY_ETA );      }
+void TrMainWindow :: onSortByNameToggled     ( bool b ) { if( b ) setSortPref( SortMode::SORT_BY_NAME );     }
+void TrMainWindow :: onSortByProgressToggled ( bool b ) { if( b ) setSortPref( SortMode::SORT_BY_PROGRESS ); }
+void TrMainWindow :: onSortByRatioToggled    ( bool b ) { if( b ) setSortPref( SortMode::SORT_BY_RATIO );    }
+void TrMainWindow :: onSortBySizeToggled     ( bool b ) { if( b ) setSortPref( SortMode::SORT_BY_SIZE );     }
+void TrMainWindow :: onSortByStateToggled    ( bool b ) { if( b ) setSortPref( SortMode::SORT_BY_STATE );    }
+void TrMainWindow :: onSortByTrackerToggled  ( bool b ) { if( b ) setSortPref( SortMode::SORT_BY_TRACKER );  }
+
+void
+TrMainWindow :: setSortAscendingPref( bool b )
+{
+    myPrefs.set( Prefs::SORT_REVERSED, b );
+}
+
+/****
+*****
+****/
+
+void
 TrMainWindow :: openProperties( )
 {
@@ -512 +537 @@
 **/
 
-void
-TrMainWindow :: setShowMode( TorrentFilter :: ShowMode mode )
-{
-    ui.filterAll->setChecked         ( mode == TorrentFilter :: SHOW_ALL );
-    ui.filterActive->setChecked      ( mode == TorrentFilter :: SHOW_ACTIVE );
-    ui.filterDownloading->setChecked ( mode == TorrentFilter :: SHOW_DOWNLOADING );
-    ui.filterSeeding->setChecked     ( mode == TorrentFilter :: SHOW_SEEDING );
-    ui.filterPaused->setChecked      ( mode == TorrentFilter :: SHOW_PAUSED );
-
-    myFilterModel.setShowMode( mode );
-}
-
-void TrMainWindow :: showAll         ( ) { setShowMode( TorrentFilter :: SHOW_ALL ); }
-void TrMainWindow :: showActive      ( ) { setShowMode( TorrentFilter :: SHOW_ACTIVE ); }
-void TrMainWindow :: showDownloading ( ) { setShowMode( TorrentFilter :: SHOW_DOWNLOADING ); }
-void TrMainWindow :: showSeeding     ( ) { setShowMode( TorrentFilter :: SHOW_SEEDING ); }
-void TrMainWindow :: showPaused      ( ) { setShowMode( TorrentFilter :: SHOW_PAUSED ); }
+void TrMainWindow :: setShowMode     ( int i ) { myPrefs.set( Prefs::FILTER_MODE, FilterMode( i ) ); }
+void TrMainWindow :: showAll         ( ) { setShowMode( FilterMode :: SHOW_ALL ); }
+void TrMainWindow :: showActive      ( ) { setShowMode( FilterMode :: SHOW_ACTIVE ); }
+void TrMainWindow :: showDownloading ( ) { setShowMode( FilterMode :: SHOW_DOWNLOADING ); }
+void TrMainWindow :: showSeeding     ( ) { setShowMode( FilterMode :: SHOW_SEEDING ); }
+void TrMainWindow :: showPaused      ( ) { setShowMode( FilterMode :: SHOW_PAUSED ); }
 
 void TrMainWindow :: filterByName    ( ) { myFilterModel.setTextMode( TorrentFilter :: FILTER_BY_NAME ); }
@@ -534 +548 @@
 void TrMainWindow :: filterByFiles   ( ) { myFilterModel.setTextMode( TorrentFilter :: FILTER_BY_FILES ); }
 
-void
-TrMainWindow :: showTotalRatio( )
-{
-    myPrefs.set( Prefs::STATUSBAR_STATS, "total-ratio" );
-}
-void
-TrMainWindow :: showTotalTransfer( )
-{
-    myPrefs.set( Prefs::STATUSBAR_STATS, "total-transfer" );
-}
-void
-TrMainWindow :: showSessionRatio( )
-{
-    myPrefs.set( Prefs::STATUSBAR_STATS, "session-ratio" );
-}
-void
-TrMainWindow :: showSessionTransfer( )
-{
-    myPrefs.set( Prefs::STATUSBAR_STATS, "session-transfer" );
-}
+void TrMainWindow :: showTotalRatio      ( ) { myPrefs.set( Prefs::STATUSBAR_STATS, "total-ratio"); }
+void TrMainWindow :: showTotalTransfer   ( ) { myPrefs.set( Prefs::STATUSBAR_STATS, "total-transfer"); }
+void TrMainWindow :: showSessionRatio    ( ) { myPrefs.set( Prefs::STATUSBAR_STATS, "session-ratio"); }
+void TrMainWindow :: showSessionTransfer ( ) { myPrefs.set( Prefs::STATUSBAR_STATS, "session-transfer"); }
 
 /**
@@ -631 +629 @@
 
         case Prefs::SORT_MODE:
-            i = myFilterModel.getSortModeFromName( myPrefs.getString( key ) );
-            ui.action_SortByActivity->setChecked ( i == TorrentFilter::SORT_BY_ACTIVITY );
-            ui.action_SortByAge->setChecked      ( i == TorrentFilter::SORT_BY_AGE );
-            ui.action_SortByETA->setChecked      ( i == TorrentFilter::SORT_BY_ETA );
-            ui.action_SortByName->setChecked     ( i == TorrentFilter::SORT_BY_NAME );
-            ui.action_SortByProgress->setChecked ( i == TorrentFilter::SORT_BY_PROGRESS );
-            ui.action_SortByRatio->setChecked    ( i == TorrentFilter::SORT_BY_RATIO );
-            ui.action_SortBySize->setChecked     ( i == TorrentFilter::SORT_BY_SIZE );
-            ui.action_SortByState->setChecked    ( i == TorrentFilter::SORT_BY_STATE );
-            ui.action_SortByTracker->setChecked  ( i == TorrentFilter::SORT_BY_TRACKER );
+            i = myPrefs.get<SortMode>(key).mode( );
+            ui.action_SortByActivity->setChecked ( i == SortMode::SORT_BY_ACTIVITY );
+            ui.action_SortByAge->setChecked      ( i == SortMode::SORT_BY_AGE );
+            ui.action_SortByETA->setChecked      ( i == SortMode::SORT_BY_ETA );
+            ui.action_SortByName->setChecked     ( i == SortMode::SORT_BY_NAME );
+            ui.action_SortByProgress->setChecked ( i == SortMode::SORT_BY_PROGRESS );
+            ui.action_SortByRatio->setChecked    ( i == SortMode::SORT_BY_RATIO );
+            ui.action_SortBySize->setChecked     ( i == SortMode::SORT_BY_SIZE );
+            ui.action_SortByState->setChecked    ( i == SortMode::SORT_BY_STATE );
+            ui.action_SortByTracker->setChecked  ( i == SortMode::SORT_BY_TRACKER );
             break;
 
         case Prefs::FILTER_MODE:
-            i = myFilterModel.getShowModeFromName( myPrefs.getString( key ) );
-            ui.filterAll->setChecked         ( i == TorrentFilter::SHOW_ALL );
-            ui.filterActive->setChecked      ( i == TorrentFilter::SHOW_ACTIVE );
-            ui.filterDownloading->setChecked ( i == TorrentFilter::SHOW_DOWNLOADING );
-            ui.filterSeeding->setChecked     ( i == TorrentFilter::SHOW_SEEDING );
-            ui.filterPaused->setChecked      ( i == TorrentFilter::SHOW_PAUSED );
-            break;
-
+            i = myPrefs.get<FilterMode>(key).mode( );
+            ui.filterAll->setChecked         ( i == FilterMode::SHOW_ALL );
+            ui.filterActive->setChecked      ( i == FilterMode::SHOW_ACTIVE );
+            ui.filterDownloading->setChecked ( i == FilterMode::SHOW_DOWNLOADING );
+            ui.filterSeeding->setChecked     ( i == FilterMode::SHOW_SEEDING );
+            ui.filterPaused->setChecked      ( i == FilterMode::SHOW_PAUSED );
+            break;
 
         case Prefs::FILTERBAR:

trunk/qt/mainwin.h

@@ -69 +69 @@
 
     private:
-        void setShowMode( TorrentFilter::ShowMode );
+        void setShowMode( int );
         QSet<int> getSelectedTorrents( ) const;
         void updateNetworkIcon( );
@@ -102 +102 @@
         void toggleWindows( );
 
+     private slots:
+        void setSortPref( int );
+        void setSortAscendingPref( bool );
+        void onSortByActivityToggled ( bool b );
+        void onSortByAgeToggled      ( bool b );
+        void onSortByETAToggled      ( bool b );
+        void onSortByNameToggled     ( bool b );
+        void onSortByProgressToggled ( bool b );
+        void onSortByRatioToggled    ( bool b );
+        void onSortBySizeToggled     ( bool b );
+        void onSortByStateToggled    ( bool b );
+        void onSortByTrackerToggled  ( bool b );
+
+
      public slots:
         void startAll( );

trunk/qt/prefs-dialog.cc

@@ -172 +172 @@
 {
     const int key( sender()->property( PREF_KEY ).toInt( ) );
-    myPrefs.set( key, qPrintable(text) );
+    myPrefs.set( key, text );
 }
 

trunk/qt/prefs.cc

@@ -23 +23 @@
 #include <libtransmission/utils.h>
 #include "prefs.h"
+#include "types.h"
 
 /***
@@ -41 +42 @@
     { TRASH_ORIGINAL, "trash-original-torrent-files", QVariant::Bool },
     { ASKQUIT, "prompt-before-exit", QVariant::Bool },
-    { SORT_MODE, "sort-mode", QVariant::String },
+    { SORT_MODE, "sort-mode", TrTypes::SortModeType },
     { SORT_REVERSED, "sort-reversed", QVariant::Bool },
     { MINIMAL_VIEW, "minimal-view", QVariant::Bool },
@@ -55 +56 @@
     { MAIN_WINDOW_X, "main-window-x", QVariant::Int },
     { MAIN_WINDOW_Y, "main-window-y", QVariant::Int },
-    { FILTER_MODE, "filter-mode", QVariant::String },
+    { FILTER_MODE, "filter-mode", TrTypes::FilterModeType },
 
     /* libtransmission settings */
@@ -135 +136 @@
                     myValues[i].setValue( qlonglong(intVal) );
                 break;
+            case TrTypes::SortModeType:
+                if( tr_bencGetStr( b, &str ) )
+                    myValues[i] = QVariant::fromValue( SortMode( str ) );
+                break;
+            case TrTypes::FilterModeType:
+                if( tr_bencGetStr( b, &str ) )
+                    myValues[i] = QVariant::fromValue( FilterMode( str ) );
+                break;
             case QVariant::String:
                 if( tr_bencGetStr( b, &str ) )
@@ -179 +188 @@
             case QVariant::Int:
                 tr_bencDictAddInt( &top, key, val.toInt() );
+                break;
+            case TrTypes::SortModeType:
+                tr_bencDictAddStr( &top, key, val.value<SortMode>().name().toUtf8().constData() );
+                break;
+            case TrTypes::FilterModeType:
+                tr_bencDictAddStr( &top, key, val.value<FilterMode>().name().toUtf8().constData() );
                 break;
             case QVariant::String:

trunk/qt/prefs.h

@@ -21 +21 @@
 #include <libtransmission/transmission.h>
 #include <libtransmission/bencode.h>
+
+#include "filters.h"
 
 class Prefs: public QObject
@@ -115 +117 @@
             int id;
             const char * key;
-            QVariant::Type type;
+            int type;
         };
 
@@ -129 +131 @@
         bool isClient( int key ) const { return !isCore( key ); }
         const char * keyStr( int i ) const { return myItems[i].key; }
-        QVariant::Type type( int i ) const { return myItems[i].type; }
+        int type( int i ) const { return myItems[i].type; }
         const QVariant& variant( int i ) const { return myValues[i]; }
 
@@ -141 +143 @@
         QDateTime getDateTime( int key ) const;
 
+        template<typename T> T get( int key ) const {
+            return myValues[key].value<T>();
+        }
+
+        void set( int key, char * value ) { set( key, QString::fromUtf8(value) ); }
+        void set( int key, const char * value ) { set( key, QString::fromUtf8(value) ); }
+
         template<typename T> void set( int key, const T& value ) {
             QVariant& v( myValues[key] );
-            const QVariant tmp( value );
+            const QVariant tmp = QVariant::fromValue(value);
             if( v.isNull() || (v!=tmp) ) {
                 v = tmp;

trunk/qt/qtransmission.pro

@@ -21 +21 @@
            details.h \
            file-tree.h \
+           filters.h \
            hig.h \
            mainwin.h \
@@ -45 +46 @@
            details.cc \
            file-tree.cc \
+           filters.cc \
            hig.cc \
            mainwin.cc \

trunk/qt/session.cc

@@ -658 +658 @@
                 break;
             }
+            case TrTypes :: FilterModeType:
+            case TrTypes :: SortModeType:
             case QVariant :: String: {
                 const char * val;

trunk/qt/torrent-filter.cc

@@ -13 +13 @@
 #include <iostream>
 
+#include "filters.h"
 #include "prefs.h"
 #include "torrent.h"
@@ -20 +21 @@
 TorrentFilter :: TorrentFilter( Prefs& prefs ):
     myPrefs( prefs ),
-    myShowMode( getShowModeFromName( prefs.getString( Prefs::FILTER_MODE ) ) ),
-    myTextMode( FILTER_BY_NAME ),
-    mySortMode( getSortModeFromName( prefs.getString( Prefs::SORT_MODE ) ) ),
-    myIsAscending( prefs.getBool( Prefs::SORT_REVERSED ) )
+    myTextMode( FILTER_BY_NAME )
 {
-    resort( );
+    // listen for changes to the preferences to know when to refilter / resort
+    connect( &myPrefs, SIGNAL(changed(int)), this, SLOT(refreshPref(int)));
+
+    // initialize our state from the current prefs
+    QList<int> initKeys;
+    initKeys << Prefs :: SORT_MODE
+             << Prefs :: FILTER_MODE;
+    foreach( int key, initKeys )
+        refreshPref( key );
 }
 
 TorrentFilter :: ~TorrentFilter( )
 {
+}
+
+void
+TorrentFilter :: refreshPref( int key )
+{
+    switch( key )
+    {
+        case Prefs :: SORT_MODE:
+        case Prefs :: SORT_REVERSED:
+            sort( 0, myPrefs.getBool(Prefs::SORT_REVERSED) ? Qt::AscendingOrder : Qt::DescendingOrder );
+            invalidate( );
+            break;
+        case Prefs :: FILTER_MODE:
+            invalidateFilter( );
+            break;
+    }
 }
 
@@ -37 +59 @@
 
 void
-TorrentFilter :: setShowMode( int showMode )
+TorrentFilter :: setTextMode( int i )
 {
-    if( myShowMode != showMode )
+    if( myTextMode != i )
     {
-        myPrefs.set( Prefs :: FILTER_MODE, getShowName( showMode ) );
-        myShowMode = ShowMode( showMode );
-        invalidateFilter( );
-    }
-}
-
-void
-TorrentFilter :: setTextMode( int textMode )
-{
-    if( myTextMode != textMode )
-    {
-        myTextMode = TextMode( textMode );
+        myTextMode = TextMode( i );
         invalidateFilter( );
     }
@@ -69 +80 @@
 }
 
+/***
+****
+***/
+
+bool
+TorrentFilter :: lessThan( const QModelIndex& left, const QModelIndex& right ) const
+{
+    const Torrent * a = sourceModel()->data( left, TorrentModel::TorrentRole ).value<const Torrent*>();
+    const Torrent * b = sourceModel()->data( right, TorrentModel::TorrentRole ).value<const Torrent*>();
+    bool less;
+
+    switch( myPrefs.get<SortMode>(Prefs::SORT_MODE).mode() )
+    {
+        case SortMode :: SORT_BY_SIZE:
+            less = a->sizeWhenDone() < b->sizeWhenDone();
+            break;
+        case SortMode :: SORT_BY_ACTIVITY:
+            less = a->downloadSpeed() + a->uploadSpeed() < b->downloadSpeed() + b->uploadSpeed();
+            break;
+        case SortMode :: SORT_BY_AGE:
+            less = a->dateAdded() < b->dateAdded();
+            break;
+        case SortMode :: SORT_BY_ID:
+            less = a->id() < b->id();
+            break;
+        case SortMode :: SORT_BY_RATIO:
+            less = a->compareRatio( *b ) < 0;
+            break;
+        case SortMode :: SORT_BY_PROGRESS:
+            less = a->percentDone() < b->percentDone();
+            break;
+        case SortMode :: SORT_BY_ETA:
+            less = a->compareETA( *b ) < 0;
+            break;
+        case SortMode :: SORT_BY_STATE:
+            if( a->hasError() != b->hasError() )
+                less = a->hasError();
+            else
+                less = a->getActivity() < b->getActivity();
+            break;
+        case SortMode :: SORT_BY_TRACKER:
+            less = a->compareTracker( *b ) < 0;
+            break;
+        default:
+            less = a->name().compare( b->name(), Qt::CaseInsensitive ) > 0;
+            break;
+    }
+
+    return less;
+}
+
+
+/***
+****
+***/
+
 bool
 TorrentFilter :: filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const
@@ -77 +144 @@
     bool accepts;
 
-    switch( myShowMode )
+    switch( myPrefs.get<FilterMode>(Prefs::FILTER_MODE).mode() )
     {
-        case SHOW_ALL:
+        case FilterMode::SHOW_ALL:
             accepts = true;
             break;
-        case SHOW_ACTIVE:
+        case FilterMode::SHOW_ACTIVE:
             accepts = tor->peersWeAreUploadingTo( ) > 0 || tor->peersWeAreDownloadingFrom( ) > 0 || tor->isVerifying( );
             break;
-        case SHOW_DOWNLOADING:
+        case FilterMode::SHOW_DOWNLOADING:
             accepts = activity == TR_STATUS_DOWNLOAD;
             break;
-        case SHOW_SEEDING:
+        case FilterMode::SHOW_SEEDING:
             accepts = activity == TR_STATUS_SEED;
             break;
-        case SHOW_PAUSED:
+        case FilterMode::SHOW_PAUSED:
             accepts = activity == TR_STATUS_STOPPED;
             break;
@@ -112 +179 @@
 }
 
-/***
-****
-***/
-
-namespace
-{
-    struct NameAndNum
-    {
-        const char * name;
-        int num;
-    };
-
-    const struct NameAndNum showModes[] = {
-        { "show-all",         TorrentFilter::SHOW_ALL },
-        { "show-active",      TorrentFilter::SHOW_ACTIVE },
-        { "show-downloading", TorrentFilter::SHOW_DOWNLOADING },
-        { "show-seeding",     TorrentFilter::SHOW_SEEDING },
-        { "show-paused",      TorrentFilter::SHOW_PAUSED }
-    };
-
-    const int showModeCount = sizeof(showModes) / sizeof(showModes[0]);
-
-    const struct NameAndNum sortModes[] = {
-        { "sort-by-name",     TorrentFilter::SORT_BY_NAME },
-        { "sort-by-activity", TorrentFilter::SORT_BY_ACTIVITY },
-        { "sort-by-age",      TorrentFilter::SORT_BY_AGE },
-        { "sort-by-eta",      TorrentFilter::SORT_BY_ETA },
-        { "sort-by-progress", TorrentFilter::SORT_BY_PROGRESS },
-        { "sort-by-ratio",    TorrentFilter::SORT_BY_RATIO },
-        { "sort-by-size",     TorrentFilter::SORT_BY_SIZE },
-        { "sort-by-state",    TorrentFilter::SORT_BY_STATE },
-        { "sort-by-tracker",  TorrentFilter::SORT_BY_TRACKER }
-    };
-
-    const int sortModeCount = sizeof(sortModes) / sizeof(sortModes[0]);
-
-    int getNum( const struct NameAndNum * rows, int numRows, const QString& name )
-    {
-        for( int i=0; i<numRows; ++i )
-            if( name == rows[i].name )
-                return rows[i].num;
-        return rows[0].num; // fallback value
-    }
-
-    const char* getName( const struct NameAndNum * rows, int numRows, int num )
-    {
-        for( int i=0; i<numRows; ++i )
-            if( num == rows[i].num )
-                return rows[i].name;
-        return rows[0].name; // fallback value
-    }
-}
-
-TorrentFilter :: ShowMode
-TorrentFilter :: getShowModeFromName( const QString& key ) const
-{
-    return ShowMode( getNum( showModes, showModeCount, key ) );
-}
-
-const char*
-TorrentFilter :: getShowName( int mode ) const
-{
-    if( mode < 0 ) mode = getShowMode( );
-    return getName( showModes, showModeCount, mode );
-}
-
-TorrentFilter :: SortMode
-TorrentFilter :: getSortModeFromName( const QString& key ) const
-{
-    return SortMode( getNum( sortModes, sortModeCount, key ) );
-}
-
-const char*
-TorrentFilter :: getSortName( int mode ) const
-{
-    if( mode < 0 ) mode = getSortMode( );
-    return getName( sortModes, sortModeCount, mode );
-}
-
-/***
-****
-***/
-
-void
-TorrentFilter :: resort( )
-{
-    invalidate( );
-    sort( 0, myIsAscending ? Qt::AscendingOrder : Qt::DescendingOrder );
-}
-
-void
-TorrentFilter :: setAscending( bool b )
-{
-    if( myIsAscending != b )
-    {
-        myIsAscending = b;
-        resort( );
-    }
-}
-
-void
-TorrentFilter :: setSortMode( int sortMode )
-{
-    if( mySortMode != sortMode )
-    {
-        myPrefs.set( Prefs :: SORT_MODE, getSortName( sortMode ) );
-        mySortMode = SortMode( sortMode );
-        setDynamicSortFilter ( true );
-        resort( );
-    }
-}
-
-void TorrentFilter :: sortByActivity ( ) { setSortMode( SORT_BY_ACTIVITY ); }
-void TorrentFilter :: sortByAge      ( ) { setSortMode( SORT_BY_AGE ); }
-void TorrentFilter :: sortByETA      ( ) { setSortMode( SORT_BY_ETA ); }
-void TorrentFilter :: sortById       ( ) { setSortMode( SORT_BY_ID ); }
-void TorrentFilter :: sortByName     ( ) { setSortMode( SORT_BY_NAME ); }
-void TorrentFilter :: sortByProgress ( ) { setSortMode( SORT_BY_PROGRESS ); }
-void TorrentFilter :: sortByRatio    ( ) { setSortMode( SORT_BY_RATIO ); }
-void TorrentFilter :: sortBySize     ( ) { setSortMode( SORT_BY_SIZE ); }
-void TorrentFilter :: sortByState    ( ) { setSortMode( SORT_BY_STATE ); }
-void TorrentFilter :: sortByTracker  ( ) { setSortMode( SORT_BY_TRACKER ); }
-
-bool
-TorrentFilter :: lessThan( const QModelIndex& left, const QModelIndex& right ) const
-{
-    const Torrent * a = sourceModel()->data( left, TorrentModel::TorrentRole ).value<const Torrent*>();
-    const Torrent * b = sourceModel()->data( right, TorrentModel::TorrentRole ).value<const Torrent*>();
-    bool less;
-
-    switch( getSortMode( ) )
-    {
-        case SORT_BY_SIZE:
-            less = a->sizeWhenDone() < b->sizeWhenDone();
-            break;
-        case SORT_BY_ACTIVITY:
-            less = a->downloadSpeed() + a->uploadSpeed() < b->downloadSpeed() + b->uploadSpeed();
-            break;
-        case SORT_BY_AGE:
-            less = a->dateAdded() < b->dateAdded();
-            break;
-        case SORT_BY_ID:
-            less = a->id() < b->id();
-            break;
-        case SORT_BY_RATIO:
-            less = a->compareRatio( *b ) < 0;
-            break;
-        case SORT_BY_PROGRESS:
-            less = a->percentDone() < b->percentDone();
-            break;
-        case SORT_BY_ETA:
-            less = a->compareETA( *b ) < 0;
-            break;
-        case SORT_BY_STATE:
-            if( a->hasError() != b->hasError() )
-                less = a->hasError();
-            else
-                less = a->getActivity() < b->getActivity();
-            break;
-        case SORT_BY_TRACKER:
-            less = a->compareTracker( *b ) < 0;
-            break;
-        default:
-            less = a->name().compare( b->name(), Qt::CaseInsensitive ) > 0;
-            break;
-    }
-
-    return less;
-}
-
 int
 TorrentFilter :: hiddenRowCount( ) const
@@ -287 +184 @@
     return sourceModel()->rowCount( ) - rowCount( );
 }
-

trunk/qt/torrent-filter.h

@@ -15 +15 @@
 
 #include <QSortFilterProxyModel>
+#include <QMetaType>
+#include <QVariant>
+
 
 struct Prefs;
@@ -28 +31 @@
 
     public:
-        enum ShowMode { SHOW_ALL, SHOW_ACTIVE, SHOW_DOWNLOADING, SHOW_SEEDING, SHOW_PAUSED };
-        ShowMode getShowMode( ) const { return myShowMode; }
-        ShowMode getShowModeFromName( const QString& name ) const;
-        const char * getShowName( int mode=-1 ) const;
-
         enum TextMode { FILTER_BY_NAME, FILTER_BY_FILES, FILTER_BY_TRACKER };
         TextMode getTextMode( ) const { return myTextMode; }
-
-        enum SortMode{ SORT_BY_ACTIVITY, SORT_BY_AGE, SORT_BY_ETA, SORT_BY_NAME,
-                       SORT_BY_PROGRESS, SORT_BY_RATIO, SORT_BY_SIZE,
-                       SORT_BY_STATE, SORT_BY_TRACKER, SORT_BY_ID };
-        SortMode getSortMode( ) const { return mySortMode; }
-        SortMode getSortModeFromName( const QString& name) const;
-        const char * getSortName( int mode=-1 ) const;
-
-        bool isAscending( ) const { return myIsAscending; }
-
         int hiddenRowCount( ) const;
 
+    public slots:
+        void setTextMode( int textMode );
+        void setText( QString );
 
-    public slots:
-        void setShowMode( int showMode );
-        void setTextMode( int textMode );
-        void setSortMode( int sortMode );
-        void setText( QString );
-        void sortByActivity( );
-        void sortByAge( );
-        void sortByETA( );
-        void sortById( );
-        void sortByName( );
-        void sortByProgress( );
-        void sortByRatio( );
-        void sortBySize( );
-        void sortByState( );
-        void sortByTracker( );
-        void setAscending( bool );
-        void resort( );
+    private slots:
+        void refreshPref( int key );
 
     protected:
@@ -72 +48 @@
     private:
         Prefs& myPrefs;
-        ShowMode myShowMode;
         TextMode myTextMode;
-        SortMode mySortMode;
-        bool myIsAscending;
         QString myText;
 };

trunk/qt/types.h

@@ -23 +23 @@
         {
             PeerList = QVariant::UserType,
-            FileList
+            FileList,
+            FilterModeType,
+            SortModeType
         };
 };