oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

proxy: add dedicated Proxy dialog and preferences fields

Browse Source 
- New ProxyDialog (Tools > Proxy Settings..., plus 'Proxy Settings...'
  in the project panel and timeline Proxy submenus) unifying global
  proxy settings, per-footage custom presets, generation and deletion
  in one place instead of three scattered entry points; this also fixes
  the Tools menu action opening the wrong preferences tab
- Preferences Disk tab gains an 'include audio in proxies' checkbox and
  an ffmpeg executable path field (blank = auto-detect)
- Add ProxyDialog smoke tests
This commit is contained in:
Mike-Solar
2026-07-16 22:53:13 +08:00
parent 6aaf37e2e5
commit ddca6a5e01
13 changed files with 592 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/dialog/preferences/tabs/preferencesdisktab.cpp
+30
View File
@@ -139,6 +139,33 @@ PreferencesDiskTab::PreferencesDiskTab()
proxy_preset_combo_->setCurrentText(OLIVE_CONFIG("ProxyPreset").toString());
proxy_layout->addWidget(proxy_preset_combo_, proxy_row, 3);
proxy_row++;
proxy_include_audio_checkbox_ =
new QCheckBox(tr("Include audio in proxies"));
proxy_include_audio_checkbox_->setChecked(
OLIVE_CONFIG("ProxyIncludeAudio").toBool());
proxy_layout->addWidget(proxy_include_audio_checkbox_, proxy_row, 0, 1, 2);
proxy_row++;
proxy_layout->addWidget(new QLabel(tr("ffmpeg Executable:")), proxy_row,
0);
proxy_ffmpeg_path_edit_ =
new QLineEdit(OLIVE_CONFIG("FFmpegPath").toString());
proxy_ffmpeg_path_edit_->setPlaceholderText(tr("Auto-detect"));
proxy_layout->addWidget(proxy_ffmpeg_path_edit_, proxy_row, 1);
QPushButton *ffmpeg_browse_btn = new QPushButton(tr("Browse..."));
connect(ffmpeg_browse_btn, &QPushButton::clicked, this, [this]() {
const QString file = QFileDialog::getOpenFileName(
this, tr("Select ffmpeg Executable"));
if (!file.isEmpty()) {
proxy_ffmpeg_path_edit_->setText(file);
}
});
proxy_layout->addWidget(ffmpeg_browse_btn, proxy_row, 2);
outer_layout->addStretch();
}
@@ -183,6 +210,9 @@ void PreferencesDiskTab::Accept(MultiUndoCommand *command)
static_cast<int>(proxy_height_slider_->GetValue());
OLIVE_CONFIG("ProxyCRF") = static_cast<int>(proxy_crf_slider_->GetValue());
OLIVE_CONFIG("ProxyPreset") = proxy_preset_combo_->currentText();
OLIVE_CONFIG("ProxyIncludeAudio") =
proxy_include_audio_checkbox_->isChecked();
OLIVE_CONFIG("FFmpegPath") = proxy_ffmpeg_path_edit_->text().trimmed();
}
}