diff --git a/src/settings/collectionsettingspage.cpp b/src/settings/collectionsettingspage.cpp index 603a76795..7129a9b07 100644 --- a/src/settings/collectionsettingspage.cpp +++ b/src/settings/collectionsettingspage.cpp @@ -23,7 +23,6 @@ #include -#include #include #include #include @@ -84,16 +83,6 @@ CollectionSettingsPage::CollectionSettingsPage(SettingsDialog *dialog, QWidget * ui_->combobox_disk_cache_size->addItem("MB", static_cast(CacheSizeUnit::MB)); ui_->combobox_disk_cache_size->addItem("GB", static_cast(CacheSizeUnit::GB)); - ui_->combobox_iopriority->addItem("Auto", static_cast(Utilities::IoPriority::IOPRIO_CLASS_NONE)); - ui_->combobox_iopriority->addItem("Realtime", static_cast(Utilities::IoPriority::IOPRIO_CLASS_RT)); - ui_->combobox_iopriority->addItem("Best effort", static_cast(Utilities::IoPriority::IOPRIO_CLASS_BE)); - ui_->combobox_iopriority->addItem("Idle", static_cast(Utilities::IoPriority::IOPRIO_CLASS_IDLE)); - - ui_->combobox_threadpriority->addItem("Idle", QThread::Priority::IdlePriority); - ui_->combobox_threadpriority->addItem("Lowest", QThread::Priority::LowestPriority); - ui_->combobox_threadpriority->addItem("Low", QThread::Priority::LowPriority); - ui_->combobox_threadpriority->addItem("Normal", QThread::Priority::NormalPriority); - QObject::connect(ui_->add, &QPushButton::clicked, this, &CollectionSettingsPage::Add); QObject::connect(ui_->remove, &QPushButton::clicked, this, &CollectionSettingsPage::Remove); @@ -251,18 +240,6 @@ void CollectionSettingsPage::Load() { ui_->checkbox_delete_files->hide(); #endif -#ifndef Q_OS_WIN32 - ui_->combobox_iopriority->setCurrentIndex(ui_->combobox_iopriority->findData(s.value("io_priority", static_cast(Utilities::IoPriority::IOPRIO_CLASS_IDLE)).toInt())); -#endif - - ui_->combobox_threadpriority->setCurrentIndex(ui_->combobox_threadpriority->findData(s.value("thread_priority", QThread::Priority::IdlePriority).toInt())); - - int workers = s.value("tagreader_workers", qBound(1, QThread::idealThreadCount() / 2, 4)).toInt(); - if (workers <= 0 || workers > 4) { - workers = 4; - } - ui_->spinbox_tagreaderworkers->setValue(workers); - s.endGroup(); DiskCacheEnable(ui_->checkbox_disk_cache->checkState()); @@ -327,13 +304,6 @@ void CollectionSettingsPage::Save() { s.setValue("delete_files", ui_->checkbox_delete_files->isChecked()); -#ifndef Q_OS_WIN32 - s.setValue("io_priority", ui_->combobox_iopriority->currentData().toInt()); -#endif - - s.setValue("thread_priority", ui_->combobox_threadpriority->currentData().toInt()); - s.setValue("tagreader_workers", ui_->spinbox_tagreaderworkers->value()); - s.endGroup(); } diff --git a/src/settings/collectionsettingspage.ui b/src/settings/collectionsettingspage.ui index 35a0d2bc8..2606f33d0 100644 --- a/src/settings/collectionsettingspage.ui +++ b/src/settings/collectionsettingspage.ui @@ -6,8 +6,8 @@ 0 0 - 516 - 1513 + 519 + 1546 @@ -608,86 +608,6 @@ If there are no matches then it will use the largest image in the directory. - - - - Advanced - - - - - - - - - 100 - 16777215 - - - - - - - - - 100 - 16777215 - - - - -1 - - - - - - - - 60 - 16777215 - - - - 1 - - - 4 - - - - - - - Tagreader workers - - - - - - - Thread priority - - - - - - - I/O priority - - - - - - - - - Advanced settings require restart. - - - - - -