Browse Source

- FEATURE: Display total amount of uploaded data in finished list

- Updated language files
adaptive-webui-19844
Christophe Dumez 16 years ago
parent
commit
5e41a64c8b
  1. 1
      Changelog
  2. 6
      src/FinishedListDelegate.h
  3. 18
      src/FinishedTorrents.cpp
  4. 1
      src/FinishedTorrents.h
  5. BIN
      src/lang/qbittorrent_bg.qm
  6. 969
      src/lang/qbittorrent_bg.ts
  7. BIN
      src/lang/qbittorrent_ca.qm
  8. 896
      src/lang/qbittorrent_ca.ts
  9. BIN
      src/lang/qbittorrent_cs.qm
  10. 562
      src/lang/qbittorrent_cs.ts
  11. BIN
      src/lang/qbittorrent_da.qm
  12. 761
      src/lang/qbittorrent_da.ts
  13. BIN
      src/lang/qbittorrent_de.qm
  14. 977
      src/lang/qbittorrent_de.ts
  15. BIN
      src/lang/qbittorrent_el.qm
  16. 989
      src/lang/qbittorrent_el.ts
  17. BIN
      src/lang/qbittorrent_en.qm
  18. 541
      src/lang/qbittorrent_en.ts
  19. BIN
      src/lang/qbittorrent_es.qm
  20. 981
      src/lang/qbittorrent_es.ts
  21. BIN
      src/lang/qbittorrent_fi.qm
  22. 828
      src/lang/qbittorrent_fi.ts
  23. BIN
      src/lang/qbittorrent_fr.qm
  24. 1020
      src/lang/qbittorrent_fr.ts
  25. BIN
      src/lang/qbittorrent_hu.qm
  26. 738
      src/lang/qbittorrent_hu.ts
  27. 906
      src/lang/qbittorrent_it.ts
  28. 783
      src/lang/qbittorrent_ja.ts
  29. 972
      src/lang/qbittorrent_ko.ts
  30. 847
      src/lang/qbittorrent_nb.ts
  31. 960
      src/lang/qbittorrent_nl.ts
  32. 991
      src/lang/qbittorrent_pl.ts
  33. 952
      src/lang/qbittorrent_pt.ts
  34. 952
      src/lang/qbittorrent_pt_BR.ts
  35. 914
      src/lang/qbittorrent_ro.ts
  36. 960
      src/lang/qbittorrent_ru.ts
  37. 956
      src/lang/qbittorrent_sk.ts
  38. 540
      src/lang/qbittorrent_sv.ts
  39. 950
      src/lang/qbittorrent_tr.ts
  40. 960
      src/lang/qbittorrent_uk.ts
  41. 1000
      src/lang/qbittorrent_zh.ts
  42. 559
      src/lang/qbittorrent_zh_TW.ts
  43. 8
      src/seeding.ui

1
Changelog

@ -1,5 +1,6 @@
* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.4.0 * Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.4.0
- FEATURE: Allow to define temporary download folder - FEATURE: Allow to define temporary download folder
- FEATURE: Display total amount of uploaded data in finished list
- COSMETIC: Redesigned program preferences - COSMETIC: Redesigned program preferences
- COSMETIC: Updated icons set - COSMETIC: Updated icons set

6
src/FinishedListDelegate.h

@ -36,8 +36,9 @@
#define F_SIZE 1 #define F_SIZE 1
#define F_UPSPEED 2 #define F_UPSPEED 2
#define F_LEECH 3 #define F_LEECH 3
#define F_RATIO 4 #define F_UPLOAD 4
#define F_HASH 5 #define F_RATIO 5
#define F_HASH 6
class FinishedListDelegate: public QItemDelegate { class FinishedListDelegate: public QItemDelegate {
Q_OBJECT Q_OBJECT
@ -51,6 +52,7 @@ class FinishedListDelegate: public QItemDelegate {
QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option); QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option);
switch(index.column()){ switch(index.column()){
case F_SIZE: case F_SIZE:
case F_UPLOAD:
QItemDelegate::drawBackground(painter, opt, index); QItemDelegate::drawBackground(painter, opt, index);
QItemDelegate::drawDisplay(painter, opt, option.rect, misc::friendlyUnit(index.data().toLongLong())); QItemDelegate::drawDisplay(painter, opt, option.rect, misc::friendlyUnit(index.data().toLongLong()));
break; break;

18
src/FinishedTorrents.cpp

@ -37,11 +37,12 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
setupUi(this); setupUi(this);
actionStart->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/play.png"))); actionStart->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/play.png")));
actionPause->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/pause.png"))); actionPause->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/pause.png")));
finishedListModel = new QStandardItemModel(0,6); finishedListModel = new QStandardItemModel(0,7);
finishedListModel->setHeaderData(F_NAME, Qt::Horizontal, tr("Name", "i.e: file name")); finishedListModel->setHeaderData(F_NAME, Qt::Horizontal, tr("Name", "i.e: file name"));
finishedListModel->setHeaderData(F_SIZE, Qt::Horizontal, tr("Size", "i.e: file size")); finishedListModel->setHeaderData(F_SIZE, Qt::Horizontal, tr("Size", "i.e: file size"));
finishedListModel->setHeaderData(F_UPSPEED, Qt::Horizontal, tr("UP Speed", "i.e: Upload speed")); finishedListModel->setHeaderData(F_UPSPEED, Qt::Horizontal, tr("UP Speed", "i.e: Upload speed"));
finishedListModel->setHeaderData(F_LEECH, Qt::Horizontal, tr("Leechers", "i.e: full/partial sources")); finishedListModel->setHeaderData(F_LEECH, Qt::Horizontal, tr("Leechers", "i.e: full/partial sources"));
finishedListModel->setHeaderData(F_UPLOAD, Qt::Horizontal, tr("Total uploaded", "i.e: Total amount of uploaded data"));
finishedListModel->setHeaderData(F_RATIO, Qt::Horizontal, tr("Ratio")); finishedListModel->setHeaderData(F_RATIO, Qt::Horizontal, tr("Ratio"));
finishedList->setModel(finishedListModel); finishedList->setModel(finishedListModel);
loadHiddenColumns(); loadHiddenColumns();
@ -80,6 +81,7 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
connect(actionHOSColSize, SIGNAL(triggered()), this, SLOT(hideOrShowColumnSize())); connect(actionHOSColSize, SIGNAL(triggered()), this, SLOT(hideOrShowColumnSize()));
connect(actionHOSColUpSpeed, SIGNAL(triggered()), this, SLOT(hideOrShowColumnUpSpeed())); connect(actionHOSColUpSpeed, SIGNAL(triggered()), this, SLOT(hideOrShowColumnUpSpeed()));
connect(actionHOSColLeechers, SIGNAL(triggered()), this, SLOT(hideOrShowColumnLeechers())); connect(actionHOSColLeechers, SIGNAL(triggered()), this, SLOT(hideOrShowColumnLeechers()));
connect(actionHOSColUpload, SIGNAL(triggered()), this, SLOT(hideOrShowColumnUpload()));
connect(actionHOSColRatio, SIGNAL(triggered()), this, SLOT(hideOrShowColumnRatio())); connect(actionHOSColRatio, SIGNAL(triggered()), this, SLOT(hideOrShowColumnRatio()));
} }
@ -107,6 +109,7 @@ void FinishedTorrents::addTorrent(QString hash){
finishedListModel->setData(finishedListModel->index(row, F_SIZE), QVariant((qlonglong)h.actual_size())); finishedListModel->setData(finishedListModel->index(row, F_SIZE), QVariant((qlonglong)h.actual_size()));
finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), QVariant((double)0.)); finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), QVariant((double)0.));
finishedListModel->setData(finishedListModel->index(row, F_LEECH), QVariant("0")); finishedListModel->setData(finishedListModel->index(row, F_LEECH), QVariant("0"));
finishedListModel->setData(finishedListModel->index(row, F_UPLOAD), QVariant((qlonglong)h.all_time_upload()));
finishedListModel->setData(finishedListModel->index(row, F_RATIO), QVariant(QString::fromUtf8(misc::toString(BTSession->getRealRatio(hash)).c_str()))); finishedListModel->setData(finishedListModel->index(row, F_RATIO), QVariant(QString::fromUtf8(misc::toString(BTSession->getRealRatio(hash)).c_str())));
finishedListModel->setData(finishedListModel->index(row, F_HASH), QVariant(hash)); finishedListModel->setData(finishedListModel->index(row, F_HASH), QVariant(hash));
if(h.is_paused()) { if(h.is_paused()) {
@ -263,6 +266,9 @@ void FinishedTorrents::updateTorrent(QTorrentHandle h) {
if(!finishedList->isColumnHidden(F_LEECH)) { if(!finishedList->isColumnHidden(F_LEECH)) {
finishedListModel->setData(finishedListModel->index(row, F_LEECH), misc::toQString(h.num_peers() - h.num_seeds(), true)); finishedListModel->setData(finishedListModel->index(row, F_LEECH), misc::toQString(h.num_peers() - h.num_seeds(), true));
} }
if(!finishedList->isColumnHidden(F_UPLOAD)) {
finishedListModel->setData(finishedListModel->index(row, F_UPLOAD), QVariant((double)h.all_time_upload()));
}
if(!finishedList->isColumnHidden(F_RATIO)) { if(!finishedList->isColumnHidden(F_RATIO)) {
finishedListModel->setData(finishedListModel->index(row, F_RATIO), QVariant(misc::toQString(BTSession->getRealRatio(hash)))); finishedListModel->setData(finishedListModel->index(row, F_RATIO), QVariant(misc::toQString(BTSession->getRealRatio(hash))));
} }
@ -458,6 +464,10 @@ void FinishedTorrents::hideOrShowColumnLeechers() {
hideOrShowColumn(F_LEECH); hideOrShowColumn(F_LEECH);
} }
void FinishedTorrents::hideOrShowColumnUpload() {
hideOrShowColumn(F_UPLOAD);
}
void FinishedTorrents::hideOrShowColumnRatio() { void FinishedTorrents::hideOrShowColumnRatio() {
hideOrShowColumn(F_RATIO); hideOrShowColumn(F_RATIO);
} }
@ -520,6 +530,9 @@ QAction* FinishedTorrents::getActionHoSCol(int index) {
case F_LEECH : case F_LEECH :
return actionHOSColLeechers; return actionHOSColLeechers;
break; break;
case F_UPLOAD :
return actionHOSColUpload;
break;
case F_RATIO : case F_RATIO :
return actionHOSColRatio; return actionHOSColRatio;
break; break;
@ -542,6 +555,7 @@ void FinishedTorrents::toggleFinishedListSortOrder(int index) {
case F_SIZE: case F_SIZE:
case F_UPSPEED: case F_UPSPEED:
case F_RATIO: case F_RATIO:
case F_UPLOAD:
sortFinishedListFloat(index, sortOrder); sortFinishedListFloat(index, sortOrder);
break; break;
default: default:
@ -566,6 +580,8 @@ void FinishedTorrents::sortFinishedList(int index, Qt::SortOrder sortOrder){
switch(index) { switch(index) {
case F_SIZE: case F_SIZE:
case F_UPSPEED: case F_UPSPEED:
case F_UPLOAD:
case F_RATIO:
sortFinishedListFloat(index, sortOrder); sortFinishedListFloat(index, sortOrder);
break; break;
default: default:

1
src/FinishedTorrents.h

@ -71,6 +71,7 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
void hideOrShowColumnSize(); void hideOrShowColumnSize();
void hideOrShowColumnUpSpeed(); void hideOrShowColumnUpSpeed();
void hideOrShowColumnLeechers(); void hideOrShowColumnLeechers();
void hideOrShowColumnUpload();
void hideOrShowColumnRatio(); void hideOrShowColumnRatio();
void forceRecheck(); void forceRecheck();

BIN
src/lang/qbittorrent_bg.qm

Binary file not shown.

969
src/lang/qbittorrent_bg.ts

File diff suppressed because it is too large Load Diff

BIN
src/lang/qbittorrent_ca.qm

Binary file not shown.

896
src/lang/qbittorrent_ca.ts

File diff suppressed because it is too large Load Diff

BIN
src/lang/qbittorrent_cs.qm

Binary file not shown.

562
src/lang/qbittorrent_cs.ts

File diff suppressed because it is too large Load Diff

BIN
src/lang/qbittorrent_da.qm

Binary file not shown.

761
src/lang/qbittorrent_da.ts

File diff suppressed because it is too large Load Diff

BIN
src/lang/qbittorrent_de.qm

Binary file not shown.

977
src/lang/qbittorrent_de.ts

File diff suppressed because it is too large Load Diff

BIN
src/lang/qbittorrent_el.qm

Binary file not shown.

989
src/lang/qbittorrent_el.ts

File diff suppressed because it is too large Load Diff

BIN
src/lang/qbittorrent_en.qm

Binary file not shown.

541
src/lang/qbittorrent_en.ts

File diff suppressed because it is too large Load Diff

BIN
src/lang/qbittorrent_es.qm

Binary file not shown.

981
src/lang/qbittorrent_es.ts

File diff suppressed because it is too large Load Diff

BIN
src/lang/qbittorrent_fi.qm

Binary file not shown.

828
src/lang/qbittorrent_fi.ts

File diff suppressed because it is too large Load Diff

BIN
src/lang/qbittorrent_fr.qm

Binary file not shown.

1020
src/lang/qbittorrent_fr.ts

File diff suppressed because it is too large Load Diff

BIN
src/lang/qbittorrent_hu.qm

Binary file not shown.

738
src/lang/qbittorrent_hu.ts

File diff suppressed because it is too large Load Diff

906
src/lang/qbittorrent_it.ts

File diff suppressed because it is too large Load Diff

783
src/lang/qbittorrent_ja.ts

File diff suppressed because it is too large Load Diff

972
src/lang/qbittorrent_ko.ts

File diff suppressed because it is too large Load Diff

847
src/lang/qbittorrent_nb.ts

File diff suppressed because it is too large Load Diff

960
src/lang/qbittorrent_nl.ts

File diff suppressed because it is too large Load Diff

991
src/lang/qbittorrent_pl.ts

File diff suppressed because it is too large Load Diff

952
src/lang/qbittorrent_pt.ts

File diff suppressed because it is too large Load Diff

952
src/lang/qbittorrent_pt_BR.ts

File diff suppressed because it is too large Load Diff

914
src/lang/qbittorrent_ro.ts

File diff suppressed because it is too large Load Diff

960
src/lang/qbittorrent_ru.ts

File diff suppressed because it is too large Load Diff

956
src/lang/qbittorrent_sk.ts

File diff suppressed because it is too large Load Diff

540
src/lang/qbittorrent_sv.ts

File diff suppressed because it is too large Load Diff

950
src/lang/qbittorrent_tr.ts

File diff suppressed because it is too large Load Diff

960
src/lang/qbittorrent_uk.ts

File diff suppressed because it is too large Load Diff

1000
src/lang/qbittorrent_zh.ts

File diff suppressed because it is too large Load Diff

559
src/lang/qbittorrent_zh_TW.ts

File diff suppressed because it is too large Load Diff

8
src/seeding.ui

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>seeding</class> <class>seeding</class>
<widget class="QWidget" name="seeding"> <widget class="QWidget" name="seeding">
@ -37,7 +38,7 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;u>Note:&lt;/u> It is important that you keep sharing your torrents after they are finished for the well being of the network.</string> <string>&lt;u&gt;Note:&lt;/u&gt; It is important that you keep sharing your torrents after they are finished for the well being of the network.</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -129,6 +130,11 @@
<string>Force recheck</string> <string>Force recheck</string>
</property> </property>
</action> </action>
<action name="actionHOSColUpload">
<property name="text">
<string>Total uploaded</string>
</property>
</action>
</widget> </widget>
<resources> <resources>
<include location="icons.qrc"/> <include location="icons.qrc"/>

Loading…
Cancel
Save