Browse Source

Merge pull request #8441 from Chocobo1/runExt

Revert back to QLineEdit for "Run external program". Closes #7800.
adaptive-webui-19844
Mike Tzou 7 years ago committed by GitHub
parent
commit
38dc6ab8cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      src/gui/optionsdlg.cpp
  2. 2
      src/gui/optionsdlg.ui

6
src/gui/optionsdlg.cpp

@ -270,7 +270,7 @@ OptionsDialog::OptionsDialog(QWidget *parent) @@ -270,7 +270,7 @@ OptionsDialog::OptionsDialog(QWidget *parent)
connect(m_ui->mailNotifUsername, &QLineEdit::textChanged, this, &ThisType::enableApplyButton);
connect(m_ui->mailNotifPassword, &QLineEdit::textChanged, this, &ThisType::enableApplyButton);
connect(m_ui->autoRunBox, &QGroupBox::toggled, this, &ThisType::enableApplyButton);
connect(m_ui->autoRun_txt, &FileSystemPathEdit::selectedPathChanged, this, &ThisType::enableApplyButton);
connect(m_ui->autoRun_txt, &QLineEdit::textChanged, this, &ThisType::enableApplyButton);
const QString autoRunStr = QString("%1\n %2\n %3\n %4\n %5\n %6\n %7\n %8\n %9\n %10\n%11")
.arg(tr("Supported parameters (case sensitive):"))
@ -601,7 +601,7 @@ void OptionsDialog::saveOptions() @@ -601,7 +601,7 @@ void OptionsDialog::saveOptions()
pref->setMailNotificationSMTPUsername(m_ui->mailNotifUsername->text());
pref->setMailNotificationSMTPPassword(m_ui->mailNotifPassword->text());
pref->setAutoRunEnabled(m_ui->autoRunBox->isChecked());
pref->setAutoRunProgram(m_ui->autoRun_txt->selectedPath().trimmed());
pref->setAutoRunProgram(m_ui->autoRun_txt->text().trimmed());
pref->setActionOnDblClOnTorrentDl(getActionOnDblClOnTorrentDl());
pref->setActionOnDblClOnTorrentFn(getActionOnDblClOnTorrentFn());
TorrentFileGuard::setAutoDeleteMode(!m_ui->deleteTorrentBox->isChecked() ? TorrentFileGuard::Never
@ -862,7 +862,7 @@ void OptionsDialog::loadOptions() @@ -862,7 +862,7 @@ void OptionsDialog::loadOptions()
m_ui->mailNotifPassword->setText(pref->getMailNotificationSMTPPassword());
m_ui->autoRunBox->setChecked(pref->isAutoRunEnabled());
m_ui->autoRun_txt->setSelectedPath(pref->getAutoRunProgram());
m_ui->autoRun_txt->setText(pref->getAutoRunProgram());
intValue = pref->getActionOnDblClOnTorrentDl();
if (intValue >= m_ui->actionTorrentDlOnDblClBox->count())
intValue = 0;

2
src/gui/optionsdlg.ui

@ -1213,7 +1213,7 @@ @@ -1213,7 +1213,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_19">
<item>
<widget class="FileSystemPathLineEdit" name="autoRun_txt" native="true"/>
<widget class="QLineEdit" name="autoRun_txt"/>
</item>
<item>
<widget class="QLabel" name="autoRun_param">

Loading…
Cancel
Save