mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Pereferences UI: add media tab

Browse source 
Remove the preference settings dealing with thumbnails (currently under
General preferences and Profile preferences) and put them in a newly-created
Media preference tab.

Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
willemferguson 2019-12-08 11:30:16 +02:00 • committed by Dirk Hohndel
parent 3e853e37a5
commit 2ac279d129
18 changed files with 398 additions and 226 deletions
Download patch file Download diff file Expand all files Collapse all files

50
desktop-widgets/preferences/preferences_defaults.cpp
View file

@ -47,46 +47,6 @@ void PreferencesDefaults::on_localDefaultFile_toggled(bool toggle)
ui->chooseFile->setEnabled(toggle);
}
void PreferencesDefaults::checkFfmpegExecutable()
{
QString s = ui->ffmpegExecutable->text().trimmed();
// If the user didn't provide a string they probably didn't intend to run ffmeg,
// so let's not give an error message.
if (s.isEmpty())
return;
// Try to execute ffmpeg. But wait at most 2 sec for startup and execution
// so that the UI doesn't hang unnecessarily.
QProcess ffmpeg;
ffmpeg.start(s);
if (!ffmpeg.waitForStarted(2000) || !ffmpeg.waitForFinished(3000))
QMessageBox::warning(this, tr("Warning"), tr("Couldn't execute ffmpeg at given location. Thumbnailing will not work."));
}
void PreferencesDefaults::on_ffmpegFile_clicked()
{
QFileInfo fi(system_default_filename());
QString ffmpegFileName = QFileDialog::getOpenFileName(this, tr("Select ffmpeg executable"));
if (!ffmpegFileName.isEmpty()) {
ui->ffmpegExecutable->setText(ffmpegFileName);
checkFfmpegExecutable();
}
}
void PreferencesDefaults::on_ffmpegExecutable_editingFinished()
{
checkFfmpegExecutable();
}
void PreferencesDefaults::on_extractVideoThumbnails_toggled(bool toggled)
{
ui->videoThumbnailPosition->setEnabled(toggled);
ui->ffmpegExecutable->setEnabled(toggled);
ui->ffmpegFile->setEnabled(toggled);
}
void PreferencesDefaults::on_resetRememberedDCs_clicked()
{
qPrefDiveComputer::set_vendor1(QString());
@ -125,13 +85,6 @@ void PreferencesDefaults::refreshSettings()
ui->btnUseDefaultFile->setEnabled(qPrefGeneral::default_file_behavior() == LOCAL_DEFAULT_FILE);
ui->chooseFile->setEnabled(qPrefGeneral::default_file_behavior() == LOCAL_DEFAULT_FILE);
ui->videoThumbnailPosition->setEnabled(qPrefGeneral::extract_video_thumbnails());
ui->ffmpegExecutable->setEnabled(qPrefGeneral::extract_video_thumbnails());
ui->ffmpegFile->setEnabled(qPrefGeneral::extract_video_thumbnails());
ui->extractVideoThumbnails->setChecked(qPrefGeneral::extract_video_thumbnails());
ui->videoThumbnailPosition->setValue(qPrefGeneral::extract_video_thumbnails_position());
ui->ffmpegExecutable->setText(qPrefGeneral::ffmpeg_executable());
ui->extraEnvironmentalDefault->setChecked(prefs.extraEnvironmentalDefault);
}
@ -146,9 +99,6 @@ void PreferencesDefaults::syncSettings()
general->set_default_file_behavior(LOCAL_DEFAULT_FILE);
else if (ui->cloudDefaultFile->isChecked())
general->set_default_file_behavior(CLOUD_DEFAULT_FILE);
general->set_extract_video_thumbnails(ui->extractVideoThumbnails->isChecked());
general->set_extract_video_thumbnails_position(ui->videoThumbnailPosition->value());
general->set_ffmpeg_executable(ui->ffmpegExecutable->text());
qPrefDisplay::set_divelist_font(ui->font->currentFont().toString());
qPrefDisplay::set_font_size(ui->fontsize->value());