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

Squashed commit of the following:

Browse Source 
commit 8e06ded5769a41294d1f6645b1442634d2f503ff
Author: itsmattkc <itsmattkc@gmail.com>
Date:   Thu May 7 03:18:39 2020 +1000

    updated widget layout consistency

commit ba0ef33d56af23ccb611bc10293bd6cd0a52f250
Merge: 0f306550 9a4f7b54
Author: itsmattkc <itsmattkc@gmail.com>
Date:   Thu May 7 03:12:12 2020 +1000

    Merge branch 'pp_tabs' of https://github.com/ThomasWilshaw/olive into ThomasWilshaw-pp_tabs

commit 9a4f7b546eb096c64de16ab6ea9d942963ac9ae2
Author: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date:   Mon May 4 23:56:26 2020 +0100

    Tabify Project Properties

    Move the project properites from boxes to tabs.
This commit is contained in:
itsmattkc
2020-05-07 03:19:25 +10:00
parent 43ee598e01
commit 3da9643da2
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/dialog/projectproperties/projectproperties.cpp
+10 -7
View File
@@ -44,10 +44,12 @@ ProjectPropertiesDialog::ProjectPropertiesDialog(Project* p, QWidget *parent) :
setWindowTitle(tr("Project Properties for '%1'").arg(working_project_->name()));
QTabWidget* tabs = new QTabWidget;
layout->addWidget(tabs);
{
// Color management group
QGroupBox* color_group = new QGroupBox();
color_group->setTitle(tr("Color Management"));
QWidget* color_group = new QWidget();
QGridLayout* color_layout = new QGridLayout(color_group);
@@ -72,18 +74,19 @@ ProjectPropertiesDialog::ProjectPropertiesDialog(Project* p, QWidget *parent) :
color_layout->addWidget(browse_btn, 0, 2);
connect(browse_btn, &QPushButton::clicked, this, &ProjectPropertiesDialog::BrowseForOCIOConfig);
layout->addWidget(color_group);
ocio_filename_->setText(working_project_->color_manager()->GetConfigFilename());
connect(ocio_filename_, &QLineEdit::textChanged, this, &ProjectPropertiesDialog::OCIOFilenameUpdated);
OCIOFilenameUpdated();
tabs->addTab(color_group, tr("Color Management"));
}
{
// Paths group
QGroupBox* paths_group = new QGroupBox();
paths_group->setTitle(tr("Paths"));
QWidget* paths_group = new QWidget();
QGridLayout* paths_layout = new QGridLayout(paths_group);
@@ -104,7 +107,7 @@ ProjectPropertiesDialog::ProjectPropertiesDialog(Project* p, QWidget *parent) :
paths_layout->addWidget(proxy_path_->browse_btn(), row, 2);
paths_layout->addWidget(proxy_path_->default_box(), row, 3);
layout->addWidget(paths_group);
tabs->addTab(paths_group, tr("Paths"));
}
QDialogButtonBox* dialog_btns = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,