diff --git a/app/dialog/projectproperties/projectproperties.cpp b/app/dialog/projectproperties/projectproperties.cpp index a845cc29f..423ae414f 100644 --- a/app/dialog/projectproperties/projectproperties.cpp +++ b/app/dialog/projectproperties/projectproperties.cpp @@ -91,7 +91,6 @@ ProjectPropertiesDialog::ProjectPropertiesDialog(Project* p, QWidget *parent) : QGridLayout* paths_layout = new QGridLayout(paths_group); cache_path_ = new PathWidget(working_project_->cache_path(), this); - proxy_path_ = new PathWidget(working_project_->proxy_path(), this); int row = 0; @@ -100,13 +99,6 @@ ProjectPropertiesDialog::ProjectPropertiesDialog(Project* p, QWidget *parent) : paths_layout->addWidget(cache_path_->browse_btn(), row, 2); paths_layout->addWidget(cache_path_->default_box(), row, 3); - row++; - - paths_layout->addWidget(new QLabel(tr("Proxy Path:")), row, 0); - paths_layout->addWidget(proxy_path_->path_edit(), row, 1); - paths_layout->addWidget(proxy_path_->browse_btn(), row, 2); - paths_layout->addWidget(proxy_path_->default_box(), row, 3); - tabs->addTab(paths_group, tr("Paths")); } @@ -141,19 +133,7 @@ void ProjectPropertiesDialog::accept() return; } - if (!proxy_path_->PathIsValid(true)) { - QMessageBox mb(this); - mb.setWindowModality(Qt::WindowModal); - mb.setIcon(QMessageBox::Critical); - mb.setWindowTitle(tr("Invalid path")); - mb.setText(tr("The proxy path is invalid. Please check it and try again.")); - mb.addButton(QMessageBox::Ok); - mb.exec(); - return; - } - working_project_->set_cache_path(cache_path_->path_edit()->text()); - working_project_->set_proxy_path(proxy_path_->path_edit()->text()); // This should ripple changes throughout the program that the color config has changed, therefore must be done last working_project_->color_manager()->SetConfigAndDefaultInput(ocio_filename_->text(), diff --git a/app/dialog/projectproperties/projectproperties.h b/app/dialog/projectproperties/projectproperties.h index b7bafa012..0f7abdfab 100644 --- a/app/dialog/projectproperties/projectproperties.h +++ b/app/dialog/projectproperties/projectproperties.h @@ -89,8 +89,6 @@ private: QString ocio_config_error_; PathWidget* cache_path_; - - PathWidget* proxy_path_; private slots: void BrowseForOCIOConfig(); diff --git a/app/project/project.h b/app/project/project.h index 09c898ff2..f61fc50da 100644 --- a/app/project/project.h +++ b/app/project/project.h @@ -78,14 +78,6 @@ public: cache_path_ = cache_path; } - const QString& proxy_path() const { - return proxy_path_; - } - - void set_proxy_path(const QString& proxy_path) { - proxy_path_ = proxy_path; - } - signals: void NameChanged(); @@ -104,8 +96,6 @@ private: QString cache_path_; - QString proxy_path_; - }; using ProjectPtr = std::shared_ptr;