Changeset 11061

Timestamp:

Jul 28, 2010, 2:43:47 PM (12 years ago)

Author:

charles

Message:

(trunk qt) #3454 "sync trackers tab with GTK+ client" --

1. add "show backup trackers" togglebutton.
2. fix bug where toggling "show more" didn't take effect instantly
3. sync the "show more" preferences key with the GTK+ client
4. fix a couple of minor tracker text inconsistencies with the GTK+ client

Location:

trunk/qt

Files:

• README.txt (modified) (2 diffs)
• details.cc (modified) (8 diffs)
• details.h (modified) (4 diffs)
• prefs.cc (modified) (2 diffs)
• prefs.h (modified) (1 diff)
• qtr.pro (modified) (1 diff)
• tracker-delegate.cc (modified) (6 diffs)
• tracker-model-filter.cc (added)
• tracker-model-filter.h (added)
• tracker-model.cc (modified) (1 diff)

trunk/qt/README.txt

@@ -1 +1 @@
 VOLUNTEERS WANTED
 
+   - Qt developers and translators are needed
    - If you find a bug, please report it at http://trac.transmissionbt.com/
-   - New translations are encouraged
-   - Windows devs: it would be interesting to see if/how this works on Windows
     
 ABOUT TRANSMISSION-QT
@@ -28 +27 @@
 BUILDING
 
-   This currently is a little awkward.  We're working on it...
-
    1. Prerequisites: Qt >= 4.4 and its development packages
    2. Build Transmission as normal
-   3. If you built Transmission without DHT, edit qtr.pro:
-      - LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a
-   4. In the qt/ directory, type "qmake-qt4 qtr.pro"
-   5. In the qt/ directory, type "make"
-   6. In the qt/ directory, as root, type "INSTALL_ROOT=/usr make install"
+   3. In the qt/ directory, type "qmake qtr.pro" or "qmake-qt4 qtr.pro"
+   4. In the qt/ directory, type "make"
+   5. In the qt/ directory, as root, type "INSTALL_ROOT=/usr make install"
       (Feel free to replace /usr with /usr/local or /opt or whatever)
 

trunk/qt/details.cc

@@ -59 +59 @@
 #include "tracker-delegate.h"
 #include "tracker-model.h"
+#include "tracker-model-filter.h"
 
 class Prefs;
@@ -170 +171 @@
 
     QList<int> initKeys;
-    initKeys << Prefs :: SHOW_TRACKER_SCRAPES;
+    initKeys << Prefs :: SHOW_TRACKER_SCRAPES
+             << Prefs :: SHOW_BACKUP_TRACKERS;
     foreach( int key, initKeys )
         refreshPref( key );
@@ -224 +226 @@
     switch( key )
     {
-        case Prefs::SHOW_TRACKER_SCRAPES:
+        case Prefs :: SHOW_TRACKER_SCRAPES:
             myTrackerDelegate->setShowMore( myPrefs.getBool( key ) );
-            myTrackerView->update( );
+            myTrackerView->reset( );
+            break;
+
+        case Prefs :: SHOW_BACKUP_TRACKERS:
+            myTrackerFilter->setShowBackupTrackers( myPrefs.getBool( key ) );
             break;
 
@@ -867 +873 @@
 
 void
+Details :: onShowBackupTrackersToggled( bool val )
+{
+    myPrefs.set( Prefs::SHOW_BACKUP_TRACKERS, val );
+}
+
+void
 Details :: onHonorsSessionLimitsToggled( bool val )
 {
@@ -997 +1009 @@
     assert( selectedRows.size( ) == 1 );
     QModelIndex i = selectionModel->currentIndex( );
-    const TrackerInfo trackerInfo = myTrackerModel->data( i, TrackerModel::TrackerRole ).value<TrackerInfo>();
+    const TrackerInfo trackerInfo = myTrackerView->model()->data( i, TrackerModel::TrackerRole ).value<TrackerInfo>();
 
     bool ok = false;
@@ -1037 +1049 @@
     foreach( QModelIndex i, selectedRows )
     {
-        const TrackerInfo inf = myTrackerModel->data( i, TrackerModel::TrackerRole ).value<TrackerInfo>();
+        const TrackerInfo inf = myTrackerView->model()->data( i, TrackerModel::TrackerRole ).value<TrackerInfo>();
         torrentId_to_urls[ inf.torrentId ].append( inf.st.announce );
     }
@@ -1165 +1177 @@
     v2->setSpacing( HIG::PAD );
 
+    myTrackerModel = new TrackerModel;
+    myTrackerFilter = new TrackerModelFilter;
+    myTrackerFilter->setSourceModel( myTrackerModel );
     myTrackerView = new QTreeView;
-    myTrackerView->setModel( myTrackerModel = new TrackerModel );
+    myTrackerView->setModel( myTrackerFilter );
     myTrackerView->setHeaderHidden( true );
     myTrackerView->setSelectionMode( QTreeWidget::ExtendedSelection );
@@ -1213 +1228 @@
     v->addWidget( c, 1 );
     connect( c, SIGNAL(clicked(bool)), this, SLOT(onShowTrackerScrapesToggled(bool)) );
+
+    c = new QCheckBox( tr( "Show &backup trackers" ) );
+    c->setChecked( myPrefs.getBool( Prefs::SHOW_BACKUP_TRACKERS ) );
+    myShowBackupTrackersCheck = c;
+    v->addWidget( c, 1 );
+    connect( c, SIGNAL(clicked(bool)), this, SLOT(onShowBackupTrackersToggled(bool)) );
 
     return top;

trunk/qt/details.h

@@ -39 +39 @@
 class TrackerDelegate;
 class TrackerModel;
+class TrackerModelFilter;
 
 class Details: public QDialog
@@ -93 +94 @@
         QCheckBox * mySingleUpCheck;
         QCheckBox * myShowTrackerScrapesCheck;
+        QCheckBox * myShowBackupTrackersCheck;
         QPushButton * myAddTrackerButton;
         QPushButton * myEditTrackerButton;
@@ -122 +124 @@
 
         TrackerModel * myTrackerModel;
+        TrackerModelFilter * myTrackerFilter;
         TrackerDelegate * myTrackerDelegate;
         QTreeView * myTrackerView;
@@ -149 +152 @@
         void onIdleLimitChanged( int );
         void onShowTrackerScrapesToggled( bool );
+        void onShowBackupTrackersToggled( bool );
         void onTrackerSelectionChanged( );
         void onAddTrackerClicked( );

trunk/qt/prefs.cc

@@ -46 +46 @@
     { STATUSBAR, "show-statusbar", QVariant::Bool },
     { STATUSBAR_STATS, "statusbar-stats", QVariant::String },
-    { SHOW_TRACKER_SCRAPES, "show-tracker-scrapes", QVariant::Bool },
+    { SHOW_TRACKER_SCRAPES, "show-extra-peer-details", QVariant::Bool },
+    { SHOW_BACKUP_TRACKERS, "show-backup-trackers", QVariant::Bool },
     { TOOLBAR, "show-toolbar" , QVariant::Bool },
     { BLOCKLIST_DATE, "blocklist-date", QVariant::DateTime },
@@ -240 +241 @@
 Prefs :: initDefaults( tr_benc * d )
 {
-    tr_bencDictAddStr( d, keyStr(DIR_WATCH), tr_getDefaultDownloadDir( ) );
-    tr_bencDictAddInt( d, keyStr(DIR_WATCH_ENABLED), false );
-    tr_bencDictAddInt( d, keyStr(INHIBIT_HIBERNATION), false );
-    tr_bencDictAddInt( d, keyStr(BLOCKLIST_DATE), 0 );
-    tr_bencDictAddInt( d, keyStr(BLOCKLIST_UPDATES_ENABLED), true );
-    tr_bencDictAddStr( d, keyStr(OPEN_DIALOG_FOLDER), QDir::home().absolutePath().toLatin1() );
-    tr_bencDictAddInt( d, keyStr(SHOW_TRACKER_SCRAPES), false );
-    tr_bencDictAddInt( d, keyStr(TOOLBAR), true );
-    tr_bencDictAddInt( d, keyStr(FILTERBAR), true );
-    tr_bencDictAddInt( d, keyStr(STATUSBAR), true );
-    tr_bencDictAddInt( d, keyStr(SHOW_TRAY_ICON), false );
-    tr_bencDictAddInt( d, keyStr(SHOW_DESKTOP_NOTIFICATION), true );
-    tr_bencDictAddStr( d, keyStr(STATUSBAR_STATS), "total-ratio" );
-    tr_bencDictAddInt( d, keyStr(OPTIONS_PROMPT), true );
-    tr_bencDictAddInt( d, keyStr(MAIN_WINDOW_HEIGHT), 500 );
-    tr_bencDictAddInt( d, keyStr(MAIN_WINDOW_WIDTH), 300 );
-    tr_bencDictAddInt( d, keyStr(MAIN_WINDOW_X), 50 );
-    tr_bencDictAddInt( d, keyStr(MAIN_WINDOW_Y), 50 );
-    tr_bencDictAddStr( d, keyStr(FILTER_MODE), "all" );
-    tr_bencDictAddStr( d, keyStr(MAIN_WINDOW_LAYOUT_ORDER), "menu,toolbar,filter,list,statusbar" );
-    tr_bencDictAddStr( d, keyStr(DOWNLOAD_DIR), tr_getDefaultDownloadDir( ) );
-    tr_bencDictAddInt( d, keyStr(ASKQUIT), true );
-    tr_bencDictAddStr( d, keyStr(SORT_MODE), "sort-by-name" );
-    tr_bencDictAddInt( d, keyStr(SORT_REVERSED), false );
-    tr_bencDictAddInt( d, keyStr(COMPACT_VIEW), false );
-    tr_bencDictAddStr( d, keyStr(SESSION_REMOTE_HOST), "localhost" );
-    tr_bencDictAddInt( d, keyStr(SESSION_REMOTE_PORT), atoi(TR_DEFAULT_RPC_PORT_STR) );
+    tr_bencDictAddStr ( d, keyStr(DIR_WATCH), tr_getDefaultDownloadDir( ) );
+    tr_bencDictAddBool( d, keyStr(DIR_WATCH_ENABLED), false );
+    tr_bencDictAddBool( d, keyStr(INHIBIT_HIBERNATION), false );
+    tr_bencDictAddInt ( d, keyStr(BLOCKLIST_DATE), 0 );
+    tr_bencDictAddBool( d, keyStr(BLOCKLIST_UPDATES_ENABLED), true );
+    tr_bencDictAddStr ( d, keyStr(OPEN_DIALOG_FOLDER), QDir::home().absolutePath().toLatin1() );
+    tr_bencDictAddInt ( d, keyStr(SHOW_TRACKER_SCRAPES), false );
+    tr_bencDictAddBool( d, keyStr(TOOLBAR), true );
+    tr_bencDictAddBool( d, keyStr(FILTERBAR), true );
+    tr_bencDictAddBool( d, keyStr(STATUSBAR), true );
+    tr_bencDictAddBool( d, keyStr(SHOW_TRAY_ICON), false );
+    tr_bencDictAddBool( d, keyStr(SHOW_DESKTOP_NOTIFICATION), true );
+    tr_bencDictAddStr ( d, keyStr(STATUSBAR_STATS), "total-ratio" );
+    tr_bencDictAddBool( d, keyStr(SHOW_TRACKER_SCRAPES), false );
+    tr_bencDictAddBool( d, keyStr(SHOW_BACKUP_TRACKERS), false );
+    tr_bencDictAddBool( d, keyStr(OPTIONS_PROMPT), true );
+    tr_bencDictAddInt ( d, keyStr(MAIN_WINDOW_HEIGHT), 500 );
+    tr_bencDictAddInt ( d, keyStr(MAIN_WINDOW_WIDTH), 300 );
+    tr_bencDictAddInt ( d, keyStr(MAIN_WINDOW_X), 50 );
+    tr_bencDictAddInt ( d, keyStr(MAIN_WINDOW_Y), 50 );
+    tr_bencDictAddStr ( d, keyStr(FILTER_MODE), "all" );
+    tr_bencDictAddStr ( d, keyStr(MAIN_WINDOW_LAYOUT_ORDER), "menu,toolbar,filter,list,statusbar" );
+    tr_bencDictAddStr ( d, keyStr(DOWNLOAD_DIR), tr_getDefaultDownloadDir( ) );
+    tr_bencDictAddBool( d, keyStr(ASKQUIT), true );
+    tr_bencDictAddStr ( d, keyStr(SORT_MODE), "sort-by-name" );
+    tr_bencDictAddBool( d, keyStr(SORT_REVERSED), false );
+    tr_bencDictAddBool( d, keyStr(COMPACT_VIEW), false );
+    tr_bencDictAddStr ( d, keyStr(SESSION_REMOTE_HOST), "localhost" );
+    tr_bencDictAddInt ( d, keyStr(SESSION_REMOTE_PORT), atoi(TR_DEFAULT_RPC_PORT_STR) );
     tr_bencDictAddBool( d, keyStr(SESSION_IS_REMOTE), false );
     tr_bencDictAddBool( d, keyStr(SESSION_REMOTE_AUTH), false );

trunk/qt/prefs.h

@@ -50 +50 @@
             STATUSBAR_STATS,
             SHOW_TRACKER_SCRAPES,
+            SHOW_BACKUP_TRACKERS,
             TOOLBAR,
             BLOCKLIST_DATE,

trunk/qt/qtr.pro

@@ -37 +37 @@
            stats-dialog.cc torrent.cc torrent-delegate.cc \
            torrent-delegate-min.cc torrent-filter.cc torrent-model.cc \
-           tracker-delegate.cc tracker-model.cc triconpushbutton.cc \
-           utils.cc watchdir.cc
+           tracker-delegate.cc tracker-model.cc tracker-model-filter.cc \
+           triconpushbutton.cc utils.cc watchdir.cc
 HEADERS += $$replace(SOURCES, .cc, .h)
 HEADERS += speed.h types.h

trunk/qt/tracker-delegate.cc

@@ -26 +26 @@
 #include <QUrl>
 
+#include <libtransmission/transmission.h>
+#include <libtransmission/utils.h>
+
 #include "favicon.h"
 #include "formatter.h"
@@ -147 +150 @@
 
     // hostname
-    const QString host = Favicons::getHost( QUrl( inf.st.announce ) );
     str += inf.st.isBackup ? "<i>" : "<b>";
-    str += host;
+    char * host = NULL;
+    int port = 0;
+    tr_urlParse( inf.st.announce.toUtf8().constData(), -1, NULL, &host, &port, NULL );
+    str += QString( "%1:%2" ).arg( host ).arg( port );
+    tr_free( host );
     if( !key.isEmpty( ) ) str += " - " + key;
     str += inf.st.isBackup ? "</i>" : "</b>";
@@ -170 +176 @@
             else if( inf.st.lastAnnounceTimedOut )
             {
-                str += tr( "Peer list request timed out %1%2%3 ago; will retry" )
+                str += tr( "Peer list request %1timed out%2 %3 ago; will retry" )
                            .arg( timeout_markup_begin )
-                           .arg( tstr )
-                           .arg( timeout_markup_end );
+                           .arg( timeout_markup_end )
+                           .arg( tstr );
             }
             else
             {
-                str += tr( "Got an error %1'%2'%3 %4 ago" )
+                str += tr( "Got an error %1\"%2\"%3 %4 ago" )
                            .arg( err_markup_begin )
                            .arg( tstr )
@@ -188 +194 @@
         {
             case TR_TRACKER_INACTIVE:
-                if( inf.st.hasAnnounced ) {
+                if( !inf.st.hasAnnounced ) {
                     str += "<br/>\n";
                     str += tr( "No updates scheduled" );
@@ -233 +239 @@
                 else
                 {
-                    str += tr( "Got a scrape error %1'%2'%3 %4 ago" )
+                    str += tr( "Got a scrape error %1\"%2\"%3 %4 ago" )
                                .arg( err_markup_begin )
                                .arg( inf.st.lastScrapeResult )
@@ -271 +277 @@
     return str;
 }
-
-#if 0
-
-    if( inf.isBackup )
-        str += "<i>";
-    QString announce;
-    int announceState;
-    int downloadCount;
-    bool hasAnnounced; bool hasScraped;
-    QString host;
-    int id;
-    bool isBackup;
-    int lastAnnouncePeerCount;
-    int lastAnnounceResult;
-    int lastAnnounceStartTime;
-    bool lastAnnounceSucceeded;
-    int lastAnnounceTime;
-    bool lastAnnounceTimedOut;
-    QString lastScrapeResult;
-    int lastScrapeStartTime;
-    bool lastScrapeSucceeded;
-    int lastScrapeTime;
-    bool lastScrapeTimedOut;
-    int leecherCount;
-    int nextAnnounceTime;
-    int nextScrapeTime;
-    int scrapeState;
-    int seederCount;
-    int tier;
-
-}
-#endif

trunk/qt/tracker-model.cc

@@ -64 +64 @@
 struct CompareTrackers {
     bool operator()( const TrackerInfo& a, const TrackerInfo& b ) const {
-        if( a.torrentId != b.torrentId ) return a.torrentId < b.torrentId;
-        if( a.st.tier != b.st.tier ) return a.st.tier < b.st.tier;
+        if( a.torrentId   != b.torrentId   ) return a.torrentId < b.torrentId;
+        if( a.st.tier     != b.st.tier     ) return a.st.tier < b.st.tier;
+        if( a.st.isBackup != b.st.isBackup ) return !a.st.isBackup;
         return a.st.announce < b.st.announce;
     }