diff --git a/src/core/preferences.cpp b/src/core/preferences.cpp index 64658b96d..014986ab6 100644 --- a/src/core/preferences.cpp +++ b/src/core/preferences.cpp @@ -295,7 +295,7 @@ void Preferences::setMinimizeToTray(bool b) bool Preferences::closeToTray() const { - return value("Preferences/General/CloseToTray", false).toBool(); + return value("Preferences/General/CloseToTray", true).toBool(); } void Preferences::setCloseToTray(bool b) @@ -627,7 +627,7 @@ int Preferences::getSessionPort() const QReadLocker locker(&lock); if (useRandomPort()) return m_randomPort; - return value("Preferences/Connection/PortRangeMin", 6881).toInt(); + return value("Preferences/Connection/PortRangeMin", 8999).toInt(); } void Preferences::setSessionPort(int port) @@ -858,7 +858,7 @@ void Preferences::setMaxConnecsPerTorrent(int val) int Preferences::getMaxUploads() const { - return value("Preferences/Bittorrent/MaxUploads", 8).toInt(); + return value("Preferences/Bittorrent/MaxUploads", -1).toInt(); } void Preferences::setMaxUploads(int val) @@ -870,7 +870,7 @@ void Preferences::setMaxUploads(int val) int Preferences::getMaxUploadsPerTorrent() const { - return value("Preferences/Bittorrent/MaxUploadsPerTorrent", 4).toInt(); + return value("Preferences/Bittorrent/MaxUploadsPerTorrent", -1).toInt(); } void Preferences::setMaxUploadsPerTorrent(int val) @@ -1020,7 +1020,7 @@ void Preferences::setExecutionLogEnabled(bool b) // Queueing system bool Preferences::isQueueingSystemEnabled() const { - return value("Preferences/Queueing/QueueingEnabled", false).toBool(); + return value("Preferences/Queueing/QueueingEnabled", true).toBool(); } void Preferences::setQueueingSystemEnabled(bool enabled) @@ -1479,7 +1479,7 @@ void Preferences::resolvePeerHostNames(bool resolve) int Preferences::getMaxHalfOpenConnections() const { - const int val = value("Preferences/Connection/MaxHalfOpenConnec", 50).toInt(); + const int val = value("Preferences/Connection/MaxHalfOpenConnec", 20).toInt(); if (val <= 0) return -1; return val; @@ -1554,7 +1554,7 @@ void Preferences::enableSuperSeeding(bool enabled) bool Preferences::announceToAllTrackers() const { - return value("Preferences/Advanced/AnnounceToAllTrackers", false).toBool(); + return value("Preferences/Advanced/AnnounceToAllTrackers", true).toBool(); } void Preferences::setAnnounceToAllTrackers(bool enabled) diff --git a/src/core/qtlibtorrent/torrentmodel.cpp b/src/core/qtlibtorrent/torrentmodel.cpp index e694a551e..5d633765a 100644 --- a/src/core/qtlibtorrent/torrentmodel.cpp +++ b/src/core/qtlibtorrent/torrentmodel.cpp @@ -418,8 +418,8 @@ QVariant TorrentModel::headerData(int section, Qt::Orientation orientation, if (orientation == Qt::Horizontal) { if (role == Qt::DisplayRole) { switch(section) { - case TorrentModelItem::TR_NAME: return tr("Name", "i.e: torrent name"); case TorrentModelItem::TR_PRIORITY: return "#"; + case TorrentModelItem::TR_NAME: return tr("Name", "i.e: torrent name"); case TorrentModelItem::TR_SIZE: return tr("Size", "i.e: torrent size"); case TorrentModelItem::TR_PROGRESS: return tr("Done", "% Done"); case TorrentModelItem::TR_STATUS: return tr("Status", "Torrent status (e.g. downloading, seeding, paused)"); diff --git a/src/core/qtlibtorrent/torrentmodel.h b/src/core/qtlibtorrent/torrentmodel.h index 9284feb0b..f0bbee000 100644 --- a/src/core/qtlibtorrent/torrentmodel.h +++ b/src/core/qtlibtorrent/torrentmodel.h @@ -54,7 +54,7 @@ class TorrentModelItem : public QObject { public: enum State {STATE_DOWNLOADING, STATE_DOWNLOADING_META, STATE_ALLOCATING, STATE_STALLED_DL, STATE_SEEDING, STATE_STALLED_UP, STATE_QUEUED_DL, STATE_QUEUED_UP, STATE_CHECKING_UP, STATE_CHECKING_DL, STATE_QUEUED_CHECK, STATE_QUEUED_FASTCHECK, STATE_PAUSED_DL, STATE_PAUSED_UP, STATE_PAUSED_MISSING, STATE_FORCED_DL, STATE_FORCED_UP, STATE_INVALID}; - enum Column {TR_NAME, TR_PRIORITY, TR_SIZE, TR_TOTAL_SIZE, TR_PROGRESS, TR_STATUS, TR_SEEDS, TR_PEERS, TR_DLSPEED, TR_UPSPEED, TR_ETA, TR_RATIO, TR_LABEL, TR_ADD_DATE, TR_SEED_DATE, TR_TRACKER, TR_DLLIMIT, TR_UPLIMIT, TR_AMOUNT_DOWNLOADED, TR_AMOUNT_UPLOADED, TR_AMOUNT_LEFT, TR_TIME_ELAPSED, TR_SAVE_PATH, TR_COMPLETED, TR_RATIO_LIMIT, TR_SEEN_COMPLETE_DATE, TR_LAST_ACTIVITY, TR_AMOUNT_DOWNLOADED_SESSION, TR_AMOUNT_UPLOADED_SESSION, NB_COLUMNS}; + enum Column {TR_PRIORITY, TR_NAME, TR_SIZE, TR_TOTAL_SIZE, TR_PROGRESS, TR_STATUS, TR_SEEDS, TR_PEERS, TR_DLSPEED, TR_UPSPEED, TR_ETA, TR_RATIO, TR_LABEL, TR_ADD_DATE, TR_SEED_DATE, TR_TRACKER, TR_DLLIMIT, TR_UPLIMIT, TR_AMOUNT_DOWNLOADED, TR_AMOUNT_UPLOADED, TR_AMOUNT_DOWNLOADED_SESSION, TR_AMOUNT_UPLOADED_SESSION, TR_AMOUNT_LEFT, TR_TIME_ELAPSED, TR_SAVE_PATH, TR_COMPLETED, TR_RATIO_LIMIT, TR_SEEN_COMPLETE_DATE, TR_LAST_ACTIVITY, NB_COLUMNS}; public: TorrentModelItem(const QTorrentHandle& h); diff --git a/src/gui/options.ui b/src/gui/options.ui index c37498f5c..f6584d029 100644 --- a/src/gui/options.ui +++ b/src/gui/options.ui @@ -1068,7 +1068,7 @@ 65535 - 6881 + 8999 @@ -1177,7 +1177,7 @@ Maximum number of upload slots per torrent: - true + false @@ -1236,7 +1236,7 @@ Global maximum number of upload slots: - true + false diff --git a/src/gui/torrentcreator/createtorrent.ui b/src/gui/torrentcreator/createtorrent.ui index 81e03b292..876accdd1 100644 --- a/src/gui/torrentcreator/createtorrent.ui +++ b/src/gui/torrentcreator/createtorrent.ui @@ -239,19 +239,16 @@ Start seeding after creation + + true + - - false - Ignore share ratio limits for this torrent - - true - diff --git a/src/gui/transferlistwidget.cpp b/src/gui/transferlistwidget.cpp index db5fbc65f..2165cfc81 100644 --- a/src/gui/transferlistwidget.cpp +++ b/src/gui/transferlistwidget.cpp @@ -106,7 +106,6 @@ TransferListWidget::TransferListWidget(QWidget *parent, MainWindow *main_window, // Default hidden columns if (!column_loaded) { - setColumnHidden(TorrentModelItem::TR_PRIORITY, true); setColumnHidden(TorrentModelItem::TR_ADD_DATE, true); setColumnHidden(TorrentModelItem::TR_SEED_DATE, true); setColumnHidden(TorrentModelItem::TR_UPLIMIT, true); @@ -114,6 +113,8 @@ TransferListWidget::TransferListWidget(QWidget *parent, MainWindow *main_window, setColumnHidden(TorrentModelItem::TR_TRACKER, true); setColumnHidden(TorrentModelItem::TR_AMOUNT_DOWNLOADED, true); setColumnHidden(TorrentModelItem::TR_AMOUNT_UPLOADED, true); + setColumnHidden(TorrentModelItem::TR_AMOUNT_DOWNLOADED_SESSION, true); + setColumnHidden(TorrentModelItem::TR_AMOUNT_UPLOADED_SESSION, true); setColumnHidden(TorrentModelItem::TR_AMOUNT_LEFT, true); setColumnHidden(TorrentModelItem::TR_TIME_ELAPSED, true); setColumnHidden(TorrentModelItem::TR_SAVE_PATH, true);