mirror/qBittorrent
2
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-01-12 18:24:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

WINDOWS: Search first in PATH for python. Closes #956.

Browse Source
This commit is contained in:
sledgehammer999 2014-09-14 21:58:20 +03:00
parent 1144555eca
commit b6d4030cd8
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mainwindow.cpp
View File

@ -458,6 +458,7 @@ void MainWindow::displayRSSTab(bool enable) {
} }
void MainWindow::displaySearchTab(bool enable) { void MainWindow::displaySearchTab(bool enable) {
Preferences::instance()->setSearchEnabled(enable);
if (enable) { if (enable) {
// RSS tab // RSS tab
if (!searchEngine) { if (!searchEngine) {
@ -1327,7 +1328,14 @@ void MainWindow::on_actionRSS_Reader_triggered() {
void MainWindow::on_actionSearch_engine_triggered() { void MainWindow::on_actionSearch_engine_triggered() {
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
if (!has_python && actionSearch_engine->isChecked()) { if (!has_python && actionSearch_engine->isChecked()) {
bool res = addPythonPathToEnv(); bool res = false;
// Check if python is already in PATH
if (misc::pythonVersion())
res = true;
else
res = addPythonPathToEnv();
if (res) if (res)
has_python = true; has_python = true;
else if (QMessageBox::question(this, tr("Missing Python Interpreter"), else if (QMessageBox::question(this, tr("Missing Python Interpreter"),
@ -1544,7 +1552,6 @@ void MainWindow::pythonDownloadSuccess(QString url, QString file_path) {
has_python = addPythonPathToEnv(); has_python = addPythonPathToEnv();
if (has_python) { if (has_python) {
actionSearch_engine->setChecked(true); actionSearch_engine->setChecked(true);
Preferences::instance()->setSearchEnabled(true);
displaySearchTab(true); displaySearchTab(true);
} }
sender()->deleteLater(); sender()->deleteLater();