From a346d49b608383ad0a0ff8a6bef0996156365810 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Sat, 24 Mar 2007 17:50:53 +0000 Subject: [PATCH] - Displaying more infos about the torrent in its properties (hash, creator, comment) - Preparing GUI to allow trackers list edition (Unfinished) --- src/properties.ui | 718 ++++++++++++++++++++++++++++------------- src/properties_imp.cpp | 8 +- 2 files changed, 509 insertions(+), 217 deletions(-) diff --git a/src/properties.ui b/src/properties.ui index b0c69a4cb..4ff30d251 100644 --- a/src/properties.ui +++ b/src/properties.ui @@ -70,64 +70,209 @@ - - - 0 - - - 6 + + + Torrent infos - - - - 0 - - - 6 - - - - - - 75 - true - - - - Save path: - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - + + + 9 + + + 6 + + + + + 0 + + + 6 + + + + + 0 + + + 6 + + + + + + 0 + 29 + + + + + 75 + true + + + + Save path: + + + + + + + + 0 + 28 + + + + + 75 + true + + + + Creator: + + + + + + + + 0 + 29 + + + + + 75 + true + + + + Torrent hash: + + + + + + + + 0 + 128 + + + + + 16777215 + 120 + + + + + 75 + true + + + + Comment: + + + + + + + + + 0 + + + 6 + + + + + + 0 + 29 + + + + + + + + + + + + 0 + 28 + + + + + + + + + + + + 0 + 29 + + + + + + + + + + + + 16777215 + 120 + + + + false + + + true + + + false + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + - + - 7 - 7 + 5 + 5 0 0 @@ -135,7 +280,7 @@ 0 - 170 + 115 @@ -150,7 +295,7 @@ - Tracker + Current session @@ -176,7 +321,7 @@ 6 - + Sans Serif @@ -189,12 +334,12 @@ - Trackers: + Total uploaded: - + Sans Serif @@ -207,18 +352,30 @@ - Errors: + Total downloaded: - - - - 16777215 - 16 - + + + + Sans Serif + 9 + 50 + false + false + false + false + + + Share ratio: + + + + + Sans Serif @@ -231,7 +388,7 @@ - Current tracker: + Total failed: @@ -246,32 +403,28 @@ 6 - - - - 7 - 7 - 0 - 0 - + + + - - - QTextEdit::NoWrap + + + - - - - 16777215 - 16 - + + + + + + + @@ -279,17 +432,61 @@ + + + + Qt::Horizontal + + + + 181 + 20 + + + + - + + + + Sans Serif + 9 + 50 + false + false + false + false + + + + Download in correct order (slower but good for previewing) + + + + + + + + Trackers + + + + 9 + + + 6 + + + - 5 - 5 + 7 + 7 0 0 @@ -297,7 +494,7 @@ 0 - 115 + 170 @@ -312,7 +509,7 @@ - Current Session + Tracker @@ -329,6 +526,24 @@ 6 + + + + + Sans Serif + 9 + 50 + false + false + false + false + + + + Trackers: + + + @@ -337,6 +552,18 @@ 6 + + + + + 7 + 7 + 0 + 0 + + + + @@ -346,175 +573,234 @@ 6 - - - - Sans Serif - 9 - 50 - false - false - false - false - + + + Qt::Horizontal - - Total uploaded: + + + 40 + 20 + - + - + + + + 24 + 24 + + + + + 24 + 24 + + - - - - - - 0 - - - 6 - - - - - Sans Serif - 9 - 50 - false - false - false - false - + + + + 24 + 24 + + + + + 24 + 24 + - Total downloaded: + - - - + + + Qt::Horizontal - + + + 40 + 20 + + + + + + + + + 0 + + + 6 + - - - 0 + + + Qt::Vertical - - 6 + + + 20 + 40 + - - - - - Sans Serif - 9 - 50 - false - false - false - false - - - - Share Ratio: - - - - - - - - - - - + - - - 0 + + + + 24 + 24 + - - 6 + + + 24 + 24 + - - - - - Sans Serif - 9 - 50 - false - false - false - false - - - - Total failed: - - - - - - - - - - - + + + + + + + + + + 24 + 24 + + + + + 24 + 24 + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 0 + + + 6 + + + + + + Sans Serif + 9 + 50 + false + false + false + false + + + + Errors: + + + - - - Qt::Horizontal + + + QTextEdit::NoWrap - + + + + + + + + 0 + + + 6 + + + + - 181 - 20 + 16777215 + 16 - + + + Sans Serif + 9 + 50 + false + false + false + false + + + + Current tracker: + + + + + + + + 16777215 + 16 + + + + + + - - - - - Sans Serif - 9 - 50 - false - false - false - false - - - - Download in correct order (slower but good for previewing) - - - diff --git a/src/properties_imp.cpp b/src/properties_imp.cpp index f2415ffad..77f7a950d 100644 --- a/src/properties_imp.cpp +++ b/src/properties_imp.cpp @@ -42,11 +42,16 @@ properties::properties(QWidget *parent, torrent_handle h, QStringList trackerErr filesList->setItemDelegate(PropDelegate); connect(filesList, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT(toggleSelectedState(const QModelIndex&))); // get Infos from torrent handle - save_path->setText(QString(h.save_path().string().c_str())); fileHash = QString(misc::toString(h.info_hash()).c_str()); torrent_status torrentStatus = h.status(); torrent_info torrentInfo = h.get_torrent_info(); fileName->setText(torrentInfo.name().c_str()); + // Torrent Infos + save_path->setText(QString(h.save_path().string().c_str())); + creator->setText(QString(torrentInfo.creator().c_str())); + hash_lbl->setText(fileHash); + comment_txt->setText(QString(torrentInfo.comment().c_str())); + //Trackers QString tracker = QString(torrentStatus.current_tracker.c_str()).trimmed(); if(!tracker.isEmpty()){ trackerURL->setText(tracker); @@ -57,6 +62,7 @@ properties::properties(QWidget *parent, torrent_handle h, QStringList trackerErr for(unsigned int i=0; iaddItem(QString(trackers[i].url.c_str())); } + // Session infos char tmp[MAX_CHAR_TMP]; failed->setText(misc::friendlyUnit(torrentStatus.total_failed_bytes)); upTotal->setText(misc::friendlyUnit(torrentStatus.total_payload_upload));