[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [ktorrent] /: Remove estimation algorithm option
From: Joris Guisson <joris.guisson () gmail ! com>
Date: 2013-08-01 9:16:49
Message-ID: E1V4p05-0004XS-EW () scm ! kde ! org
[Download RAW message or body]
Git commit a441b6c1181225130623a66f249a701db13cb391 by Joris Guisson.
Committed on 01/08/2013 at 09:16.
Pushed by guisson into branch 'master'.
Remove estimation algorithm option
M +1 -0 ChangeLog
M +3 -47 ktorrent/pref/advancedpref.ui
M +0 -10 libktcore/dbus/dbussettings.cpp
M +0 -2 libktcore/dbus/dbussettings.h
M +0 -2 libktcore/interfaces/functions.cpp
M +0 -6 libktcore/ktorrent.kcfg
http://commits.kde.org/ktorrent/a441b6c1181225130623a66f249a701db13cb391
diff --git a/ChangeLog b/ChangeLog
index 7a09890..d0bab55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ Changes in 4.4:
- Fix bug causing tab counts not to be initialized when QM is disabled (313737)
- Use file contents to figure out which type of blocklist we are dealing with in IP \
filter (315239)
- Fix bug causing torrent percentage to be slightly off in the files tab (315549)
+- Remove estimation algorithm option
Changes in 4.3.1:
- Fix new custom groups not appearing in add to group submenu (307230)
diff --git a/ktorrent/pref/advancedpref.ui b/ktorrent/pref/advancedpref.ui
index ee0e669..cd4ba09 100644
--- a/ktorrent/pref/advancedpref.ui
+++ b/ktorrent/pref/advancedpref.ui
@@ -137,57 +137,13 @@
<item>
<layout class="QGridLayout">
<item row="0" column="0">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Time estimation algorithm:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QComboBox" name="kcfg_eta">
- <property name="toolTip">
- <string><p>Select which algorithm to use for estimating the time \
left :</p>
-<p><span style=" font-weight:600;">KTorrent:</span> Mix \
of other algorithms, we use the one which fits best in the current \
situation.</p>
-<p><span style=" font-weight:600;">Current speed:</span> \
Bytes left to download / current speed</p>
-<p><span style=" font-weight:600;">Average speed: \
</span>Bytes left to download / average speed</p>
-<p><span style=" font-weight:600;">Window of X:</span> \
Average of the last X samples (X = 20)</p>
-<p><span style=" font-weight:600;">Moving \
average:</span> Moving average of the last 20 \
samples</p></string>
- </property>
- <item>
- <property name="text">
- <string>KTorrent</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Current speed</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Average speed</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Window of X</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Moving average</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Preview size for audio files:</string>
</property>
</widget>
</item>
- <item row="1" column="1">
+ <item row="0" column="1">
<widget class="QSpinBox" name="kcfg_previewSizeAudio">
<property name="toolTip">
<string><p>The amount of data at the beginning and end of an \
audio file, which will be prioritized for previewing.</p></string> @@ -203,14 \
+159,14 @@ </property>
</widget>
</item>
- <item row="2" column="0">
+ <item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Preview size for video files:</string>
</property>
</widget>
</item>
- <item row="2" column="1">
+ <item row="1" column="1">
<widget class="QSpinBox" name="kcfg_previewSizeVideo">
<property name="toolTip">
<string><p>The amount of data at the beginning and end of a video \
file, which will be prioritized for previewing.</p></string>
diff --git a/libktcore/dbus/dbussettings.cpp b/libktcore/dbus/dbussettings.cpp
index 53d445d..f9c0548 100644
--- a/libktcore/dbus/dbussettings.cpp
+++ b/libktcore/dbus/dbussettings.cpp
@@ -528,16 +528,6 @@ namespace kt
Settings::setSocksPassword(val);
}
- int DBusSettings::eta()
- {
- return Settings::eta();
- }
-
- void DBusSettings::setEta(int val)
- {
- Settings::setEta(val);
- }
-
bool DBusSettings::diskPrealloc()
{
return Settings::diskPrealloc();
diff --git a/libktcore/dbus/dbussettings.h b/libktcore/dbus/dbussettings.h
index 82fc8fd..fc9fc9c 100644
--- a/libktcore/dbus/dbussettings.h
+++ b/libktcore/dbus/dbussettings.h
@@ -136,8 +136,6 @@ namespace kt
Q_SCRIPTABLE void setSocksUsername(QString val);
Q_SCRIPTABLE QString socksPassword();
Q_SCRIPTABLE void setSocksPassword(QString val);
- Q_SCRIPTABLE int eta();
- Q_SCRIPTABLE void setEta(int val);
Q_SCRIPTABLE bool diskPrealloc();
Q_SCRIPTABLE void setDiskPrealloc(bool val);
Q_SCRIPTABLE bool fullDiskPrealloc();
diff --git a/libktcore/interfaces/functions.cpp b/libktcore/interfaces/functions.cpp
index d0fbdb8..e833895 100644
--- a/libktcore/interfaces/functions.cpp
+++ b/libktcore/interfaces/functions.cpp
@@ -166,8 +166,6 @@ namespace kt
else
net::Socks::setSocksAuthentication(QString::null, QString::null);
- bt::TimeEstimator::setAlgorithm((bt::TimeEstimator::ETAlgorithm)Settings::eta());
-
bt::ChunkManager::setPreviewSizes(Settings::previewSizeAudio() * 1024, \
Settings::previewSizeVideo() * 1024);
bt::QueueManagerInterface::setQueueManagerEnabled(!Settings::manuallyControlTorrents());
bt::Downloader::setUseWebSeeds(Settings::webseedsEnabled());
diff --git a/libktcore/ktorrent.kcfg b/libktcore/ktorrent.kcfg
index c647614..abdd339 100644
--- a/libktcore/ktorrent.kcfg
+++ b/libktcore/ktorrent.kcfg
@@ -215,12 +215,6 @@
<entry name="socksPassword" type="String">
<default code="true">QString::null</default>
</entry>
- <entry name="eta" type="Int">
- <label>Algorithm to estimate the time when a torrent is finished</label>
- <default>0</default>
- <min>0</min>
- <max>4</max>
- </entry>
<entry name="diskPrealloc" type="Bool">
<default>true</default>
</entry>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic