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

revised UI color system when showing nodes

Browse Source 
Olive now has a set of colors that categories can be "assigned" to. The timeline also shares the same colors as the NodeView. Colors can be configured per node (aka per clip).
This commit is contained in:
itsmattkc
2021-01-15 18:44:34 +11:00
parent 91740dd823
commit b4dd976e90
22 changed files with 443 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/dialog/preferences/tabs/preferencesappearancetab.cpp
+9 -31
View File
@@ -28,6 +28,8 @@
#include "node/node.h"
#include "widget/colorbutton/colorbutton.h"
#include "widget/menu/menushared.h"
#include "ui/colorcoding.h"
namespace olive {
@@ -64,7 +66,7 @@ PreferencesAppearanceTab::PreferencesAppearanceTab()
{
QGroupBox* color_group = new QGroupBox();
color_group->setTitle(tr("Node Color Scheme"));
color_group->setTitle(tr("Default Node Colors"));
QGridLayout* color_layout = new QGridLayout(color_group);
@@ -72,15 +74,10 @@ PreferencesAppearanceTab::PreferencesAppearanceTab()
QString cat_name = Node::GetCategoryName(static_cast<Node::CategoryID>(i));
color_layout->addWidget(new QLabel(cat_name), i, 0);
Color c = Config::Current()[QStringLiteral("NodeCatColor%1").arg(i)].value<Color>();
colors_.append(c.toQColor());
QPushButton* color_btn = new QPushButton();
connect(color_btn, &QPushButton::clicked, this, &PreferencesAppearanceTab::ColorButtonClicked);
color_layout->addWidget(color_btn, i, 1);
color_btns_.append(color_btn);
UpdateButtonColor(i);
ColorCodingComboBox* ccc = new ColorCodingComboBox();
ccc->SetColor(Config::Current()[QStringLiteral("CatColor%1").arg(i)].toInt());
color_layout->addWidget(ccc, i, 1);
color_btns_.append(ccc);
}
appearance_layout->addWidget(color_group, row, 0, 1, 2);
@@ -98,27 +95,8 @@ void PreferencesAppearanceTab::Accept()
Config::Current()["Style"] = style_path;
}
for (int i=0;i<colors_.size();i++) {
Config::Current()[QStringLiteral("NodeCatColor%1").arg(i)] = QVariant::fromValue(Color(colors_.at(i)));
}
}
void PreferencesAppearanceTab::UpdateButtonColor(int index)
{
color_btns_.at(index)->setStyleSheet(QStringLiteral("background: %1;")
.arg(colors_.at(index).name()));
}
void PreferencesAppearanceTab::ColorButtonClicked()
{
int index = color_btns_.indexOf(static_cast<QPushButton*>(sender()));
QColor new_color = QColorDialog::getColor(colors_.at(index), this);
if (new_color.isValid()) {
colors_.replace(index, new_color);
UpdateButtonColor(index);
for (int i=0; i<color_btns_.size(); i++) {
Config::Current()[QStringLiteral("CatColor%1").arg(i)] = color_btns_.at(i)->GetSelectedColor();
}
}
app/dialog/preferences/tabs/preferencesappearancetab.h
+2 -13
View File
@@ -27,6 +27,7 @@
#include "preferencestab.h"
#include "ui/style/style.h"
#include "widget/colorlabelmenu/colorcodingcombobox.h"
namespace olive {
@@ -39,24 +40,12 @@ public:
virtual void Accept() override;
private:
/**
* @brief Show a file dialog to browse for an external CSS file to load for styling the application.
*/
void BrowseForCSS();
void UpdateButtonColor(int index);
/**
* @brief UI widget for selecting the current UI style
*/
QComboBox* style_combobox_;
QList<QColor> colors_;
QList<QPushButton*> color_btns_;
private slots:
void ColorButtonClicked();
QVector<ColorCodingComboBox*> color_btns_;
};