From b5f61708f83dcd4ccad859a055a1ea54ccc5dafb Mon Sep 17 00:00:00 2001 From: Mario Sergio Fujikawa Ferreira Date: Mon, 10 Apr 2006 23:02:10 +0000 Subject: Add a feature: an extra column to both "Downloads" and download file detail tabs. This column named 'number' holds the internal identification number of a given download. Such information is required for several console commands. --- net-p2p/kmldonkey/Makefile | 3 +- .../files/patch-src__kmldonkey__downloadpage.cpp | 10 +++++++ .../files/patch-src__kmldonkey__infodialog.cpp | 32 ++++++++++++++++++++++ .../files/patch-src__kmldonkey__infodialog.h | 11 ++++++++ .../files/patch-src__kmldonkey__infolist.cpp | 26 ++++++++++++++++++ .../files/patch-src__kmldonkey__infolist.h | 9 ++++++ 6 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 net-p2p/kmldonkey/files/patch-src__kmldonkey__downloadpage.cpp create mode 100644 net-p2p/kmldonkey/files/patch-src__kmldonkey__infodialog.cpp create mode 100644 net-p2p/kmldonkey/files/patch-src__kmldonkey__infodialog.h create mode 100644 net-p2p/kmldonkey/files/patch-src__kmldonkey__infolist.cpp create mode 100644 net-p2p/kmldonkey/files/patch-src__kmldonkey__infolist.h (limited to 'net-p2p') diff --git a/net-p2p/kmldonkey/Makefile b/net-p2p/kmldonkey/Makefile index fe947ad7fe62..5d7a1fd94ab2 100644 --- a/net-p2p/kmldonkey/Makefile +++ b/net-p2p/kmldonkey/Makefile @@ -7,7 +7,7 @@ PORTNAME= kmldonkey PORTVERSION= 0.10.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-p2p kde MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -18,7 +18,6 @@ COMMENT= KDE integration for MLDonkey eDonkey P2P client USE_KDELIBS_VER=3 USE_BZIP2= yes -USE_REINPLACE= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --program-transform-name='' diff --git a/net-p2p/kmldonkey/files/patch-src__kmldonkey__downloadpage.cpp b/net-p2p/kmldonkey/files/patch-src__kmldonkey__downloadpage.cpp new file mode 100644 index 000000000000..766778dcf3e7 --- /dev/null +++ b/net-p2p/kmldonkey/files/patch-src__kmldonkey__downloadpage.cpp @@ -0,0 +1,10 @@ +--- ./src/kmldonkey/downloadpage.cpp.orig Tue Jul 26 13:40:33 2005 ++++ ./src/kmldonkey/downloadpage.cpp Sun Apr 9 13:15:40 2006 +@@ -68,6 +68,7 @@ + downloadView->addColumn( i18n( "Last seen" ) ); + downloadView->addColumn( i18n( "Age" ) ); + downloadView->addColumn( i18n( "File type" ) ); ++ downloadView->addColumn( i18n( "Number" ) ); + downloadView->setItemsRenameable(true); + + downloadedView = new InfoList(downloadSplitter, "downloadedView", true); diff --git a/net-p2p/kmldonkey/files/patch-src__kmldonkey__infodialog.cpp b/net-p2p/kmldonkey/files/patch-src__kmldonkey__infodialog.cpp new file mode 100644 index 000000000000..e1d0ba737cd9 --- /dev/null +++ b/net-p2p/kmldonkey/files/patch-src__kmldonkey__infodialog.cpp @@ -0,0 +1,32 @@ +--- ./src/kmldonkey/infodialog.cpp.orig Tue Jul 26 13:40:33 2005 ++++ ./src/kmldonkey/infodialog.cpp Sun Apr 9 13:15:40 2006 +@@ -72,10 +72,20 @@ + layout->addWidget(makeLabel(i18n("Comment:"), frame), 6, 0); + layout->addWidget(makeLabel(i18n("Alt. names:"), frame, true), 7, 0); + ++ QHBoxLayout* l1 = new QHBoxLayout(); ++ + nameView = new KLineEdit(fi->fileName(), frame, "nameView"); + nameView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + nameView->setReadOnly(true); +- layout->addWidget(nameView, 0, 1); ++ l1->addWidget(nameView); ++ ++ l1->addWidget(makeLabel(i18n("Number:"), frame)); ++ fileNoView = new KLineEdit(humanReadableFileNumber(fi->fileNo()), frame, "fileNoView"); ++ fileNoView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); ++ fileNoView->setReadOnly(true); ++ l1->addWidget(fileNoView); ++ ++ layout->addLayout(l1, 0, 1); + + availView = new AvailabilityWidget(fileno, frame, "availView"); + layout->addWidget(availView, 1, 1); +@@ -206,6 +216,7 @@ + return; + } + nameView->setText(fi->fileName()); ++ fileNoView->setText(humanReadableFileNumber(fi->fileNo())); + availView->update(); + sizeView->setText(humanReadableSize(fi->fileDownloaded())); + totalSizeView->setText(humanReadableSize(fi->fileSize())); diff --git a/net-p2p/kmldonkey/files/patch-src__kmldonkey__infodialog.h b/net-p2p/kmldonkey/files/patch-src__kmldonkey__infodialog.h new file mode 100644 index 000000000000..1c73969a59f4 --- /dev/null +++ b/net-p2p/kmldonkey/files/patch-src__kmldonkey__infodialog.h @@ -0,0 +1,11 @@ +--- ./src/kmldonkey/infodialog.h.orig Tue Jul 26 13:40:33 2005 ++++ ./src/kmldonkey/infodialog.h Sun Apr 9 13:15:40 2006 +@@ -51,7 +51,7 @@ + private: + int fileno; + +- KLineEdit *nameView, *sizeView, *hashView, *formatView, ++ KLineEdit *nameView, *fileNoView, *sizeView, *hashView, *formatView, + *totalSizeView, *etaView, *speedView, *networkView, + *commentView; + KListBox *namesView; diff --git a/net-p2p/kmldonkey/files/patch-src__kmldonkey__infolist.cpp b/net-p2p/kmldonkey/files/patch-src__kmldonkey__infolist.cpp new file mode 100644 index 000000000000..d472e2a4acf3 --- /dev/null +++ b/net-p2p/kmldonkey/files/patch-src__kmldonkey__infolist.cpp @@ -0,0 +1,26 @@ +--- ./src/kmldonkey/infolist.cpp.orig Tue Jul 26 13:40:33 2005 ++++ ./src/kmldonkey/infolist.cpp Sun Apr 9 13:15:40 2006 +@@ -491,6 +491,14 @@ + return i18n("normal priority", "Normal"); + } + ++QString humanReadableFileNumber(int fileNo) ++{ ++ QString foo; ++ ++ foo = KGlobal::locale()->formatNumber(fileNo, 0); ++ ++ return foo; ++} + + // DownloadFile + +@@ -569,6 +577,8 @@ + } + case 13: // filetype + return KMimeType::findByURL( KURL( "file:/" + it->fileName() ), 0, false, true)->comment(); ++ case 14: // number ++ return humanReadableFileNumber(it->fileNo()); + default: + return "ERROR!"; + } diff --git a/net-p2p/kmldonkey/files/patch-src__kmldonkey__infolist.h b/net-p2p/kmldonkey/files/patch-src__kmldonkey__infolist.h new file mode 100644 index 000000000000..82853bec3963 --- /dev/null +++ b/net-p2p/kmldonkey/files/patch-src__kmldonkey__infolist.h @@ -0,0 +1,9 @@ +--- ./src/kmldonkey/infolist.h.orig Sun Apr 9 13:19:37 2006 ++++ ./src/kmldonkey/infolist.h Sun Apr 9 13:19:01 2006 +@@ -321,5 +321,6 @@ + QString humanReadableTime(time_t t, bool shortFormat); + QString calculateETA(FileInfo* fi); + QString humanReadablePriority(int pri); ++QString humanReadableFileNumber(int fileNo); + + #endif -- cgit v1.2.3