mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2026-01-02 05:38:06 -06:00
Compare commits
5 Commits
release-2.
...
v2_9_x
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8b53028828 | ||
|
|
17b7ff3fd2 | ||
|
|
9ca171c96f | ||
|
|
cfd2576002 | ||
|
|
ca0af8c858 |
@@ -1,4 +1,7 @@
|
|||||||
* Sun Jul 1 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.11
|
* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.9.12
|
||||||
|
- BUGFIX: Fix issue when "Minimize to tray" and "Start minimized" are both enabled
|
||||||
|
|
||||||
|
* Sun Jul 1 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.11
|
||||||
- BUGFIX: Fix unreversible "Minimize to tray" on some window managers
|
- BUGFIX: Fix unreversible "Minimize to tray" on some window managers
|
||||||
- BUGFIX: Fix torrent availability computation (closes #988869)
|
- BUGFIX: Fix torrent availability computation (closes #988869)
|
||||||
- BUGFIX: Bring window to front after restoring from systray
|
- BUGFIX: Bring window to front after restoring from systray
|
||||||
|
|||||||
@@ -255,9 +255,13 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
|
|||||||
readSettings();
|
readSettings();
|
||||||
|
|
||||||
if(!ui_locked) {
|
if(!ui_locked) {
|
||||||
if(pref.startMinimized() && systrayIcon)
|
if(pref.startMinimized() && systrayIcon) {
|
||||||
showMinimized();
|
show();
|
||||||
else {
|
minimizeWindow();
|
||||||
|
// XXX: Using showMinimized() makes it impossible to restore
|
||||||
|
// the window if "Minimize to systray" is enabled.
|
||||||
|
//showMinimized();
|
||||||
|
} else {
|
||||||
show();
|
show();
|
||||||
activateWindow();
|
activateWindow();
|
||||||
raise();
|
raise();
|
||||||
|
|||||||
@@ -202,7 +202,7 @@ void TrackerList::loadStickyItems(const QTorrentHandle &h) {
|
|||||||
++nb_pex;
|
++nb_pex;
|
||||||
}
|
}
|
||||||
// load DHT information
|
// load DHT information
|
||||||
if(QBtSession::instance()->isDHTEnabled() && h.has_metadata() && !h.priv()) {
|
if (QBtSession::instance()->isDHTEnabled() && !h.priv()) {
|
||||||
dht_item->setText(COL_STATUS, tr("Working"));
|
dht_item->setText(COL_STATUS, tr("Working"));
|
||||||
} else {
|
} else {
|
||||||
dht_item->setText(COL_STATUS, tr("Disabled"));
|
dht_item->setText(COL_STATUS, tr("Disabled"));
|
||||||
|
|||||||
@@ -143,7 +143,7 @@ void SearchEngine::installPython() {
|
|||||||
DownloadThread *pydownloader = new DownloadThread(this);
|
DownloadThread *pydownloader = new DownloadThread(this);
|
||||||
connect(pydownloader, SIGNAL(downloadFinished(QString,QString)), this, SLOT(pythonDownloadSuccess(QString,QString)));
|
connect(pydownloader, SIGNAL(downloadFinished(QString,QString)), this, SLOT(pythonDownloadSuccess(QString,QString)));
|
||||||
connect(pydownloader, SIGNAL(downloadFailure(QString,QString)), this, SLOT(pythonDownloadFailure(QString,QString)));
|
connect(pydownloader, SIGNAL(downloadFailure(QString,QString)), this, SLOT(pythonDownloadFailure(QString,QString)));
|
||||||
pydownloader->downloadUrl("http://python.org/ftp/python/2.7.2/python-2.7.2.msi");
|
pydownloader->downloadUrl("http://python.org/ftp/python/2.7.3/python-2.7.3.msi");
|
||||||
}
|
}
|
||||||
|
|
||||||
void SearchEngine::pythonDownloadSuccess(QString url, QString file_path) {
|
void SearchEngine::pythonDownloadSuccess(QString url, QString file_path) {
|
||||||
|
|||||||
@@ -415,7 +415,7 @@ public:
|
|||||||
item->setPriority(prio::IGNORED);
|
item->setPriority(prio::IGNORED);
|
||||||
else
|
else
|
||||||
item->setPriority(prio::NORMAL);
|
item->setPriority(prio::NORMAL);
|
||||||
emit dataChanged(this->index(0,0), this->index(rowCount(), columnCount()));
|
emit dataChanged(this->index(0,0), this->index(rowCount()-1, columnCount()-1));
|
||||||
emit filteredFilesChanged();
|
emit filteredFilesChanged();
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
Reference in New Issue
Block a user