[SCM] KTorrent Debian packaging. branch, master, updated. debian/4.2.0-1
Modestas Vainius
modax at alioth.debian.org
Sun Mar 11 15:34:26 UTC 2012
The following commit has been merged in the master branch:
commit 4ac2cf8373f39e2dad2edcd944321b0bbf9d599e
Merge: 7885ac1f4a1e841439baa393d6bc0c430393fc32 3149f839162337010b7fafc1f2634bbe4f14a67f
Author: Modestas Vainius <modax at debian.org>
Date: Sat Mar 10 20:56:18 2012 +0200
Merge tag 'upstream/4.2.0'
Upstream version 4.2.0
CMakeLists.txt | 14 +-
ChangeLog | 54 +
Messages.sh | 5 +-
RoadMap | 8 +-
kio-magnet/CMakeLists.txt | 29 -
kio-magnet/README | 14 +-
kio-magnet/dbushandler.cpp | 345 +-
kio-magnet/dbushandler.h | 7 +-
kio-magnet/kio_magnet.cpp | 62 +-
kio-magnet/kio_magnet.h | 4 +-
kio-magnet/magnetsettings.kcfg | 2 +-
ktorrent/CMakeLists.txt | 19 +-
ktorrent/core.cpp | 16 +-
ktorrent/dialogs/addpeersdlg.cpp | 2 +-
ktorrent/dialogs/fileselectdlg.cpp | 65 +-
ktorrent/dialogs/fileselectdlg.h | 2 +
ktorrent/dialogs/fileselectdlg.ui | 19 +-
ktorrent/dialogs/importdialog.cpp | 4 +-
ktorrent/dialogs/missingfilesdlg.cpp | 7 +-
ktorrent/dialogs/pastedialog.cpp | 5 +-
ktorrent/dialogs/torrentcreatordlg.cpp | 5 +-
ktorrent/groups/groupmodel.cpp | 137 +
.../groups/groupmodel.h | 43 +-
ktorrent/groups/groupview.cpp | 68 +-
ktorrent/groups/groupview.h | 16 +-
ktorrent/gui.cpp | 1 -
ktorrent/ipfilterlist.cpp | 180 +-
ktorrent/ipfilterlist.h | 28 +-
ktorrent/ipfilterwidget.cpp | 30 +-
ktorrent/ktorrent.desktop | 16 +
ktorrent/ktorrent.notifyrc | 76 +-
ktorrent/ktorrentplugin.desktop | 4 +
ktorrent/kttorrentactivityui.rc | 45 +-
ktorrent/magnet.protocol | 3 +-
ktorrent/main.cpp | 2 +-
ktorrent/pref/btpref.cpp | 16 +-
ktorrent/pref/btpref.h | 2 -
ktorrent/pref/btpref.ui | 312 +-
ktorrent/tools/queuemanagermodel.cpp | 438 +-
ktorrent/tools/queuemanagermodel.h | 26 +-
ktorrent/tools/queuemanagerwidget.cpp | 207 +-
ktorrent/tools/queuemanagerwidget.h | 11 +-
ktorrent/tools/queuemanagerwidget.ui | 100 -
ktorrent/torrentactivity.cpp | 180 +-
ktorrent/torrentactivity.h | 46 +-
ktorrent/trayicon.cpp | 11 +-
ktorrent/trayicon.h | 63 +-
.../{propertiesextender.cpp => propertiesdlg.cpp} | 35 +-
.../view/{propertiesextender.h => propertiesdlg.h} | 23 +-
.../{propertiesextender.ui => propertiesdlg.ui} | 55 +-
ktorrent/view/scanextender.cpp | 41 +-
ktorrent/view/scanextender.h | 1 +
ktorrent/view/torrentsearchbar.cpp | 89 +
.../magnetview.h => view/torrentsearchbar.h} | 54 +-
ktorrent/view/view.cpp | 698 ++-
ktorrent/view/view.h | 129 +-
ktorrent/view/viewdelegate.cpp | 175 +-
ktorrent/view/viewdelegate.h | 5 +-
.../view/viewjobtracker.cpp | 46 +-
.../view/viewjobtracker.h | 40 +-
ktorrent/view/viewmanager.cpp | 810 ---
ktorrent/view/viewmanager.h | 218 -
ktorrent/view/viewmodel.cpp | 285 +-
ktorrent/view/viewmodel.h | 18 +-
libktcore/CMakeLists.txt | 3 +-
libktcore/dbus/dbus.cpp | 19 +-
libktcore/dbus/dbussettings.cpp | 60 +-
libktcore/dbus/dbussettings.h | 12 +-
libktcore/dbus/dbustorrent.cpp | 13 +-
libktcore/groups/groupmanager.cpp | 105 +-
libktcore/groups/groupmanager.h | 37 +-
libktcore/groups/ungroupedgroup.cpp | 4 +-
libktcore/gui/extender.h | 3 +
libktcore/interfaces/functions.cpp | 11 +-
libktcore/interfaces/torrentactivityinterface.h | 5 +-
libktcore/ktorrent.kcfg | 18 -
libktcore/ktversion.h | 6 +-
libktcore/torrent/basicjobprogresswidget.h | 6 +
libktcore/torrent/basicjobprogresswidget.ui | 8 +-
libktcore/torrent/jobtracker.cpp | 71 +-
libktcore/torrent/jobtracker.h | 3 +-
libktcore/torrent/queuemanager.cpp | 2 +-
libktcore/util/hintlineedit.cpp | 133 -
libktcore/util/hintlineedit.h | 92 -
plasma/applet/CMakeLists.txt | 30 +-
plasma/applet/applet.cpp | 56 +-
plasma/applet/applet.h | 2 +
plasma/applet/plasma-applet-ktorrent.desktop | 10 +
.../dataengine/plasma-dataengine-ktorrent.desktop | 10 +
plugins/bwscheduler/CMakeLists.txt | 15 +-
plugins/bwscheduler/additemdlg.cpp | 196 -
plugins/bwscheduler/additemdlg.h | 67 -
plugins/bwscheduler/additemdlg.ui | 342 -
plugins/bwscheduler/bwprefpage.cpp | 2 +-
plugins/bwscheduler/bwschedulerplugin.cpp | 2 +-
plugins/bwscheduler/edititemdlg.cpp | 134 +-
plugins/bwscheduler/edititemdlg.h | 22 +-
plugins/bwscheduler/edititemdlg.ui | 26 +-
plugins/bwscheduler/ktbwschedulerplugin.desktop | 74 +-
plugins/bwscheduler/schedule.cpp | 126 +-
plugins/bwscheduler/schedule.h | 53 +-
plugins/bwscheduler/scheduleeditor.cpp | 29 +-
plugins/bwscheduler/scheduleeditor.h | 2 +-
plugins/bwscheduler/schedulegraphicsitem.cpp | 165 +-
plugins/bwscheduler/schedulegraphicsitem.h | 11 +-
plugins/bwscheduler/weekscene.cpp | 73 +-
plugins/bwscheduler/weekscene.h | 25 +-
plugins/bwscheduler/weekview.cpp | 15 +-
plugins/bwscheduler/weekview.h | 2 +-
.../downloadorder/ktdownloadorderplugin.desktop | 9 +-
plugins/infowidget/GeoIP.c | 1 +
plugins/infowidget/chunkdownloadmodel.cpp | 9 +-
plugins/infowidget/chunkdownloadmodel.h | 8 +-
plugins/infowidget/chunkdownloadview.cpp | 6 +-
plugins/infowidget/chunkdownloadview.h | 10 +-
plugins/infowidget/fileview.cpp | 126 +-
plugins/infowidget/fileview.h | 12 +-
plugins/infowidget/infowidgetplugin.cpp | 7 +-
plugins/infowidget/ktinfowidgetplugin.desktop | 6 +
plugins/infowidget/peerviewmodel.cpp | 2 +-
plugins/infowidget/statustab.cpp | 90 +-
plugins/infowidget/statustab.h | 5 +-
plugins/infowidget/statustab.ui | 23 +-
plugins/infowidget/trackerview.cpp | 38 +-
plugins/infowidget/trackerview.h | 8 +-
plugins/infowidget/trackerview.ui | 5 +-
plugins/infowidget/webseedsmodel.cpp | 24 +-
plugins/infowidget/webseedsmodel.h | 9 +-
plugins/infowidget/webseedstab.cpp | 44 +-
plugins/infowidget/webseedstab.h | 8 +-
plugins/ipfilter/antip2p.cpp | 34 +-
plugins/ipfilter/antip2p.h | 7 +-
plugins/ipfilter/downloadandconvertjob.cpp | 6 +-
plugins/ipfilter/ktipfilterplugin.desktop | 7 +
plugins/logviewer/ktlogviewerplugin.desktop | 7 +
.../ktmagnetgeneratorplugin.desktop | 6 +
plugins/mediaplayer/CMakeLists.txt | 3 +-
plugins/mediaplayer/ktmediaplayerplugin.desktop | 7 +
plugins/mediaplayer/ktmediaplayerplugin.kcfg | 5 -
plugins/mediaplayer/ktmediaplayerpluginui.rc | 9 +-
plugins/mediaplayer/mediacontroller.cpp | 132 +
.../mediaplayer/mediacontroller.h | 44 +-
plugins/mediaplayer/mediacontroller.ui | 156 +
plugins/mediaplayer/mediafile.cpp | 1 +
plugins/mediaplayer/mediafilestream.cpp | 14 +-
plugins/mediaplayer/mediafilestream.h | 1 -
plugins/mediaplayer/mediamodel.cpp | 4 +
plugins/mediaplayer/mediaplayer.cpp | 72 +-
plugins/mediaplayer/mediaplayer.h | 13 +-
plugins/mediaplayer/mediaplayeractivity.cpp | 87 +-
plugins/mediaplayer/mediaplayeractivity.h | 7 +-
plugins/mediaplayer/mediaplayerplugin.cpp | 1 -
plugins/mediaplayer/mediaview.cpp | 83 +-
plugins/mediaplayer/mediaview.h | 35 +-
plugins/mediaplayer/playlist.cpp | 32 +-
plugins/mediaplayer/playlist.h | 11 +-
plugins/mediaplayer/playlistwidget.cpp | 214 +-
plugins/mediaplayer/playlistwidget.h | 28 +-
plugins/mediaplayer/videochunkbar.cpp | 4 +-
plugins/mediaplayer/videowidget.cpp | 1 +
plugins/scanfolder/CMakeLists.txt | 7 +-
plugins/scanfolder/ktscanfolderplugin.desktop | 7 +
plugins/scanfolder/scanfolder.cpp | 310 +-
plugins/scanfolder/scanfolder.h | 83 +-
plugins/scanfolder/scanfolderplugin.cpp | 62 +-
plugins/scanfolder/scanfolderplugin.h | 8 +-
plugins/scanfolder/scanfolderprefpage.cpp | 13 +-
plugins/scanfolder/scanthread.cpp | 202 +
.../geoipmanager.h => scanfolder/scanthread.h} | 98 +-
plugins/scanfolder/torrentloadqueue.cpp | 181 +
plugins/scanfolder/torrentloadqueue.h | 106 +
plugins/scripting/api/scriptingmodule.cpp | 1 -
plugins/scripting/ktscriptingplugin.desktop | 9 +-
plugins/scripting/script.cpp | 5 +
plugins/scripting/script.h | 3 +
plugins/scripting/scriptdelegate.cpp | 13 +-
plugins/scripting/scriptmodel.cpp | 16 +-
.../scripts/auto_remove/auto_remove.desktop | 7 +
.../scripts/auto_resume/auto_resume.desktop | 7 +
.../email_notifications.desktop | 8 +
.../scripts/tracker_groups/tracker_groups.desktop | 10 +
plugins/search/buffernetworkreply.cpp | 2 +-
plugins/search/home/ktorrent_infopage.css | 1 +
plugins/search/ktsearchplugin.desktop | 9 +-
plugins/search/localfilenetworkreply.cpp | 9 +-
plugins/search/searchwidget.cpp | 137 +-
plugins/search/searchwidget.h | 1 +
plugins/search/webview.cpp | 101 +-
plugins/search/webview.h | 6 +
plugins/shutdown/ktshutdownplugin.desktop | 9 +-
plugins/shutdown/shutdowndlg.cpp | 5 +
plugins/shutdown/shutdowndlg.ui | 51 +-
plugins/shutdown/shutdownplugin.cpp | 13 +-
plugins/shutdown/shutdownruleset.cpp | 148 +-
plugins/shutdown/shutdownruleset.h | 16 +
plugins/stats/ConnsTabPage.cc | 472 +-
plugins/stats/ConnsTabPage.h | 42 +-
plugins/stats/DisplaySettingsPage.cc | 2 +-
plugins/stats/DisplaySettingsPage.h | 15 +-
plugins/stats/PluginPage.cc | 15 +-
plugins/stats/PluginPage.h | 38 +-
plugins/stats/SettingsPage.cc | 20 +-
plugins/stats/SettingsPage.h | 27 +-
plugins/stats/SpdTabPage.cc | 388 +-
plugins/stats/SpdTabPage.h | 77 +-
plugins/stats/StatsPlugin.cc | 173 +-
plugins/stats/StatsPlugin.h | 59 +-
plugins/stats/drawer/ChartDrawer.cc | 18 +-
plugins/stats/drawer/ChartDrawer.h | 144 +-
plugins/stats/drawer/ChartDrawerData.cc | 46 +-
plugins/stats/drawer/ChartDrawerData.h | 29 +-
plugins/stats/drawer/KPlotWgtDrawer.cc | 700 +-
plugins/stats/drawer/KPlotWgtDrawer.h | 89 +-
plugins/stats/drawer/PlainChartDrawer.cc | 934 ++--
plugins/stats/drawer/PlainChartDrawer.h | 90 +-
plugins/stats/ktstatsplugin.desktop | 7 +
plugins/syndication/feed.cpp | 32 +-
plugins/syndication/feed.h | 3 +
plugins/syndication/feedretriever.cpp | 4 +
plugins/syndication/ktsyndicationplugin.desktop | 7 +
plugins/syndication/linkdownloader.cpp | 28 +-
plugins/syndication/linkdownloader.h | 1 +
plugins/syndication/syndicationactivity.cpp | 3 +-
plugins/upnp/ktupnpplugin.desktop | 6 +
plugins/upnp/routermodel.cpp | 61 +-
plugins/upnp/routermodel.h | 13 +-
plugins/upnp/upnpwidget.cpp | 83 +-
plugins/upnp/upnpwidget.h | 1 -
plugins/webinterface/httpserver.cpp | 2 +-
plugins/webinterface/ktwebinterfaceplugin.desktop | 7 +
plugins/webinterface/www/common/action.js | 2 +-
plugins/zeroconf/ktzeroconfplugin.desktop | 7 +
plugins/zeroconf/torrentservice.cpp | 11 +-
plugins/zeroconf/torrentservice.h | 4 +-
po/CMakeLists.txt | 3 +
po/ar/ktorrent.po | 5428 +++++++-------
po/ast/ktorrent.po | 5572 +++++++--------
po/be/ktorrent.po | 5275 +++++++-------
po/bg/ktorrent.po | 6076 +++++++---------
po/bs/CMakeLists.txt | 2 +
po/{sr at ijekavianlatin => bs}/ktorrent.po | 6818 +++++++++---------
po/ca/ktorrent.po | 5550 ++++++++-------
po/ca at valencia/ktorrent.po | 5539 ++++++++-------
po/cs/ktorrent.po | 5907 ++++++++--------
po/da/ktorrent.po | 5562 ++++++++-------
po/de/ktorrent.po | 5601 ++++++++-------
po/el/ktorrent.po | 5575 ++++++++-------
po/en_GB/ktorrent.po | 5754 ++++++++--------
po/eo/ktorrent.po | 6848 ++++++++----------
po/es/ktorrent.po | 5561 ++++++++-------
po/et/ktorrent.po | 5540 ++++++++-------
po/eu/ktorrent.po | 6425 ++++++++++-------
po/fi/ktorrent.po | 5556 ++++++++-------
po/fr/ktorrent.po | 5869 ++++++++--------
po/ga/ktorrent.po | 5391 +++++++-------
po/gl/ktorrent.po | 5704 ++++++++--------
po/hi/ktorrent.po | 5226 +++++++-------
po/hne/ktorrent.po | 5104 +++++++-------
po/hr/ktorrent.po | 5594 ++++++++--------
po/hu/ktorrent.po | 6252 ++++++++--------
po/is/ktorrent.po | 5854 ++++++++--------
po/it/ktorrent.po | 5693 ++++++++--------
po/ja/ktorrent.po | 5569 +++++++--------
po/km/ktorrent.po | 5399 +++++++-------
po/ku/CMakeLists.txt | 2 +
po/{mai => ku}/ktorrent.po | 6194 +++++++++--------
po/lt/ktorrent.po | 5351 +++++++-------
po/lv/ktorrent.po | 5768 ++++++++--------
po/mai/ktorrent.po | 5006 +++++++-------
po/ms/ktorrent.po | 4960 +++++++-------
po/nb/ktorrent.po | 5396 +++++++-------
po/nds/ktorrent.po | 5499 ++++++++-------
po/nl/ktorrent.po | 5589 ++++++++-------
po/nn/ktorrent.po | 5310 +++++++-------
po/oc/ktorrent.po | 5242 +++++++-------
po/pl/ktorrent.po | 5523 ++++++++-------
po/pt/ktorrent.po | 5502 +++++++--------
po/pt_BR/ktorrent.po | 5521 ++++++++-------
po/ro/ktorrent.po | 5869 ++++++++--------
po/ru/ktorrent.po | 5504 ++++++++-------
po/se/ktorrent.po | 5228 +++++++-------
po/si/ktorrent.po | 6470 +++++++++---------
po/sk/ktorrent.po | 6485 ++++++++---------
po/sl/ktorrent.po | 5647 ++++++++--------
po/sq/CMakeLists.txt | 2 +
po/{lt => sq}/ktorrent.po | 7499 +++++++++++---------
po/sr/ktorrent.po | 5435 +++++++-------
po/sr at ijekavian/ktorrent.po | 5450 +++++++-------
po/sr at ijekavianlatin/ktorrent.po | 5419 +++++++-------
po/sr at latin/ktorrent.po | 5419 +++++++-------
po/sv/ktorrent.po | 5545 ++++++++-------
po/tr/ktorrent.po | 5900 ++++++++--------
po/ug/ktorrent.po | 5282 +++++++-------
po/uk/ktorrent.po | 5590 ++++++++--------
po/zh_CN/ktorrent.po | 6076 ++++++++---------
po/zh_TW/ktorrent.po | 5145 +++++++-------
296 files changed, 172207 insertions(+), 171244 deletions(-)
--
KTorrent Debian packaging.
More information about the pkg-kde-commits
mailing list