From a15e3496dba85b25da781c7b89c7b3a373accb22 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sun, 10 May 2020 00:54:38 +1000 Subject: [PATCH 1/2] config: improved default colors Use more distinct colors for each category. --- app/config/config.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/config/config.cpp b/app/config/config.cpp index e3024ee18..c99e4ea5a 100644 --- a/app/config/config.cpp +++ b/app/config/config.cpp @@ -83,15 +83,16 @@ void Config::SetDefaults() config_map_["DropWithoutSequenceBehavior"] = TimelineWidget::kDWSAsk; config_map_["Loop"] = false; - config_map_["NodeCatColor0"] = QVariant::fromValue(Color(0.25f, 0.25f, 0.65f)); - config_map_["NodeCatColor1"] = QVariant::fromValue(Color(0.6f, 0.6f, 0.85f)); - config_map_["NodeCatColor2"] = QVariant::fromValue(Color(0.75f, 0.75f, 0.45f)); - config_map_["NodeCatColor3"] = QVariant::fromValue(Color(0.25f, 0.5f, 0.25f)); - config_map_["NodeCatColor4"] = QVariant::fromValue(Color(0.25f, 0.65f, 0.25f)); - config_map_["NodeCatColor5"] = QVariant::fromValue(Color(0.35f, 0.35f, 0.35f)); - config_map_["NodeCatColor6"] = QVariant::fromValue(Color(0.45f, 0.45f, 0.45f)); - config_map_["NodeCatColor7"] = QVariant::fromValue(Color(0.7f, 0.3f, 0.7f)); - config_map_["NodeCatColor8"] = QVariant::fromValue(Color(0.85f, 0.65f, 0.4f)); + + config_map_["NodeCatColor0"] = QVariant::fromValue(Color(0.75f, 0.75f, 0.75f)); + config_map_["NodeCatColor1"] = QVariant::fromValue(Color(0.25f, 0.25f, 0.25f)); + config_map_["NodeCatColor2"] = QVariant::fromValue(Color(0.75f, 0.75f, 0.25f)); + config_map_["NodeCatColor3"] = QVariant::fromValue(Color(0.25f, 0.25f, 0.75f)); + config_map_["NodeCatColor4"] = QVariant::fromValue(Color(0.25f, 0.75f, 0.25f)); + config_map_["NodeCatColor5"] = QVariant::fromValue(Color(0.75f, 0.25f, 0.75f)); + config_map_["NodeCatColor6"] = QVariant::fromValue(Color(0.25f, 0.75f, 0.75f)); + config_map_["NodeCatColor7"] = QVariant::fromValue(Color(0.25f, 0.25f, 0.75f)); + config_map_["NodeCatColor8"] = QVariant::fromValue(Color(0.75f, 0.75f, 0.25f)); config_map_["AudioOutput"] = QString(); config_map_["AudioInput"] = QString(); @@ -124,8 +125,7 @@ void Config::Load() } if (!config_file.open(QFile::ReadOnly)) { - qWarning() << QCoreApplication::translate("Config", "Failed to load application settings. This session will use " - "defaults."); + qWarning() << "Failed to load application settings. This session will use defaults."; return; } From c5292f1290ef7f0b45a96746adeb8db82526e738 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sun, 10 May 2020 00:55:06 +1000 Subject: [PATCH 2/2] import: disable default matrix/math node generation While I think the matrix node is a fairly benign node to generate automatically, I think we have an easier time communicating what's actually happening in the node graph if we start with the bare essentials (video input -> clip). --- app/widget/timelinewidget/tool/import.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/widget/timelinewidget/tool/import.cpp b/app/widget/timelinewidget/tool/import.cpp index fc8662f49..1709059d9 100644 --- a/app/widget/timelinewidget/tool/import.cpp +++ b/app/widget/timelinewidget/tool/import.cpp @@ -399,6 +399,9 @@ void TimelineWidget::ImportTool::DropGhosts(bool insert) video_input->SetFootage(footage_stream); new NodeAddCommand(dst_graph, video_input, command); + new NodeEdgeAddCommand(video_input->output(), clip->texture_input(), command); + + /* MatrixGenerator* matrix = new MatrixGenerator(); new NodeAddCommand(dst_graph, matrix, command); @@ -409,6 +412,7 @@ void TimelineWidget::ImportTool::DropGhosts(bool insert) new NodeEdgeAddCommand(video_input->output(), multiply->param_a_in(), command); new NodeEdgeAddCommand(matrix->output(), multiply->param_b_in(), command); new NodeEdgeAddCommand(multiply->output(), clip->texture_input(), command); + */ break; } case Stream::kAudio: