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

Flatten Behavior preferences into sidebar categories and scroll to node on double-click

Browse Source 
Behavior preferences used a nested QTreeWidget with groups like General,
Audio, Timeline, etc. Replace it with one tab per group in the left sidebar
so users can jump directly to a category without expanding a secondary menu.

Also wire double-clicking a node in the node graph to emit a selection
signal with its context, causing the parameter panel to scroll to that
node's parameters (in addition to showing/raising the panel as before).
This commit is contained in:
Mike-Solar
2026-07-13 10:19:30 +08:00
parent 1f446f55b4
commit f57ffa482f
4 changed files with 154 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/dialog/preferences/preferences.cpp
+14 -1
View File
@@ -45,7 +45,20 @@ PreferencesDialog::PreferencesDialog(MainWindow *main_window, int start_tab)
AddTab(new PreferencesGeneralTab(), tr("General"));
AddTab(new PreferencesAppearanceTab(), tr("Appearance"));
AddTab(new PreferencesBehaviorTab(), tr("Behavior"));
AddTab(new PreferencesBehaviorTab(PreferencesBehaviorTab::kCategoryGeneral),
tr("Behavior - General"));
AddTab(new PreferencesBehaviorTab(PreferencesBehaviorTab::kCategoryAudio),
tr("Behavior - Audio"));
AddTab(new PreferencesBehaviorTab(PreferencesBehaviorTab::kCategoryTimeline),
tr("Behavior - Timeline"));
AddTab(new PreferencesBehaviorTab(PreferencesBehaviorTab::kCategoryPlayback),
tr("Behavior - Playback"));
AddTab(new PreferencesBehaviorTab(PreferencesBehaviorTab::kCategoryProject),
tr("Behavior - Project"));
AddTab(new PreferencesBehaviorTab(PreferencesBehaviorTab::kCategoryNodes),
tr("Behavior - Nodes"));
AddTab(new PreferencesBehaviorTab(PreferencesBehaviorTab::kCategoryRendering),
tr("Behavior - Rendering"));
AddTab(new PreferencesDiskTab(), tr("Disk"));
AddTab(new PreferencesAudioTab(), tr("Audio"));
AddTab(new PreferencesKeyboardTab(main_window), tr("Keyboard"));
app/dialog/preferences/tabs/preferencesbehaviortab.cpp
+97 -117
View File
@@ -21,94 +21,97 @@
#include "preferencesbehaviortab.h"
#include <QCheckBox>
#include <QComboBox>
#include <QVBoxLayout>
#include <QLabel>
#include "config/config.h"
namespace olive
{
PreferencesBehaviorTab::PreferencesBehaviorTab()
PreferencesBehaviorTab::PreferencesBehaviorTab(Category category)
: category_(category)
, graphics_backend_combobox_(nullptr)
{
QVBoxLayout *layout = new QVBoxLayout(this);
layout->setAlignment(Qt::AlignTop);
behavior_tree_ = new QTreeWidget();
layout->addWidget(behavior_tree_);
behavior_tree_->setColumnCount(2);
behavior_tree_->setHeaderLabels({ tr("Behavior"), tr("Setting") });
QTreeWidgetItem *general_group = AddParent(tr("General"));
AddItem(
tr("Enable hover focus"), QStringLiteral("HoverFocus"),
tr("Panels will be considered focused when the mouse cursor is over them without having to click them."),
general_group);
AddItem(tr("Enable slider ladder"), QStringLiteral("UseSliderLadders"),
general_group);
switch (category_) {
case kCategoryGeneral:
AddItem(tr("Enable hover focus"), QStringLiteral("HoverFocus"),
tr("Panels will be considered focused when the mouse cursor is "
"over them without having to click them."));
AddItem(tr("Enable slider ladder"), QStringLiteral("UseSliderLadders"));
AddItem(
tr("Scrolling zooms by default"), QStringLiteral("ScrollZooms"),
tr("By default, scrolling will move the view around, and holding Ctrl/Cmd will make it zoom instead. "
"Enabling this will switch those, scrolling will zoom by default, and holding Ctrl/Cmd will move the view instead."),
general_group);
tr("By default, scrolling will move the view around, and holding "
"Ctrl/Cmd will make it zoom instead. Enabling this will switch "
"those, scrolling will zoom by default, and holding Ctrl/Cmd will "
"move the view instead."));
break;
QTreeWidgetItem *audio_group = AddParent(tr("Audio"));
AddItem(tr("Enable audio scrubbing"), QStringLiteral("AudioScrubbing"),
audio_group);
case kCategoryAudio:
AddItem(tr("Enable audio scrubbing"), QStringLiteral("AudioScrubbing"));
break;
QTreeWidgetItem *timeline_group = AddParent(tr("Timeline"));
AddItem(tr("Auto-Seek to Imported Clips"),
QStringLiteral("EnableSeekToImport"), timeline_group);
AddItem(tr("Edit Tool Also Seeks"), QStringLiteral("EditToolAlsoSeeks"),
timeline_group);
AddItem(tr("Edit Tool Selects Links"),
QStringLiteral("EditToolSelectsLinks"), timeline_group);
AddItem(tr("Enable Drag Files to Timeline"),
QStringLiteral("EnableDragFilesToTimeline"), timeline_group);
AddItem(tr("Invert Timeline Scroll Axes"),
case kCategoryTimeline:
AddItems({
{ tr("Auto-Seek to Imported Clips"),
QStringLiteral("EnableSeekToImport") },
{ tr("Edit Tool Also Seeks"),
QStringLiteral("EditToolAlsoSeeks") },
{ tr("Edit Tool Selects Links"),
QStringLiteral("EditToolSelectsLinks") },
{ tr("Enable Drag Files to Timeline"),
QStringLiteral("EnableDragFilesToTimeline") },
{ tr("Invert Timeline Scroll Axes"),
QStringLiteral("InvertTimelineScrollAxes"),
tr("Hold ALT on any UI element to switch scrolling axes"),
timeline_group);
AddItem(tr("Seek Also Selects"), QStringLiteral("SeekAlsoSelects"),
timeline_group);
AddItem(tr("Seek to the End of Pastes"), QStringLiteral("PasteSeeks"),
timeline_group);
AddItem(tr("Selecting Also Seeks"), QStringLiteral("SelectAlsoSeeks"),
timeline_group);
tr("Hold ALT on any UI element to switch scrolling axes") },
{ tr("Seek Also Selects"), QStringLiteral("SeekAlsoSelects") },
{ tr("Seek to the End of Pastes"), QStringLiteral("PasteSeeks") },
{ tr("Selecting Also Seeks"), QStringLiteral("SelectAlsoSeeks") },
});
break;
QTreeWidgetItem *playback_group = AddParent(tr("Playback"));
AddItem(tr("Ask For Name When Setting Marker"),
QStringLiteral("SetNameWithMarker"), playback_group);
AddItem(tr("Automatically rewind at the end of a sequence"),
QStringLiteral("AutoSeekToBeginning"), playback_group);
case kCategoryPlayback:
AddItems({
{ tr("Ask For Name When Setting Marker"),
QStringLiteral("SetNameWithMarker") },
{ tr("Automatically rewind at the end of a sequence"),
QStringLiteral("AutoSeekToBeginning") },
});
break;
QTreeWidgetItem *project_group = AddParent(tr("Project"));
case kCategoryProject:
AddItem(tr("Drop Files on Media to Replace"),
QStringLiteral("DropFileOnMediaToReplace"), project_group);
QStringLiteral("DropFileOnMediaToReplace"));
break;
QTreeWidgetItem *node_group = AddParent(tr("Nodes"));
AddItem(tr("Add Default Effects to New Clips"),
QStringLiteral("AddDefaultEffectsToClips"), node_group);
AddItem(tr("Auto-Scale By Default"), QStringLiteral("AutoscaleByDefault"),
node_group);
AddItem(
tr("Splitting Clips Copies Dependencies"),
case kCategoryNodes:
AddItems({
{ tr("Add Default Effects to New Clips"),
QStringLiteral("AddDefaultEffectsToClips") },
{ tr("Auto-Scale By Default"),
QStringLiteral("AutoscaleByDefault") },
{ tr("Splitting Clips Copies Dependencies"),
QStringLiteral("SplitClipsCopyNodes"),
tr("Multiple clips can share the same nodes. Disable this to automatically share node "
"dependencies among clips when copying or splitting them."),
node_group);
tr("Multiple clips can share the same nodes. Disable this to "
"automatically share node dependencies among clips when copying "
"or splitting them.") },
});
break;
QTreeWidgetItem *rendering_group = AddParent(tr("Rendering"));
QTreeWidgetItem *graphics_backend_item =
new QTreeWidgetItem({ tr("Graphics Backend") });
graphics_backend_item->setToolTip(
0, tr("Selects the graphics API Oak should request on next launch. "
case kCategoryRendering:
{
QLabel *backend_label = new QLabel(tr("Graphics Backend"));
backend_label->setToolTip(
tr("Selects the graphics API Oak should request on next launch. "
"Vulkan is experimental: on most systems it will fall back to "
"OpenGL or use a prototype Vulkan path that is not yet fully validated."));
rendering_group->addChild(graphics_backend_item);
"OpenGL or use a prototype Vulkan path that is not yet fully "
"validated."));
graphics_backend_combobox_ = new QComboBox();
graphics_backend_combobox_->addItem(tr("OpenGL"), QStringLiteral("opengl"));
graphics_backend_combobox_->addItem(tr("OpenGL"),
QStringLiteral("opengl"));
graphics_backend_combobox_->addItem(tr("Vulkan (experimental)"),
QStringLiteral("vulkan"));
const QString current_backend =
@@ -119,75 +122,52 @@ PreferencesBehaviorTab::PreferencesBehaviorTab()
graphics_backend_combobox_->setCurrentIndex(backend_index >= 0
? backend_index
: 0);
behavior_tree_->setItemWidget(graphics_backend_item, 1,
graphics_backend_combobox_);
QTreeWidgetItem *opengl_group = AddParent(tr("OpenGL"), rendering_group);
AddItem(tr("Use glFinish"), QStringLiteral("UseGLFinish"), opengl_group);
QHBoxLayout *backend_layout = new QHBoxLayout();
backend_layout->addWidget(backend_label);
backend_layout->addWidget(graphics_backend_combobox_, 1);
layout->addLayout(backend_layout);
AddItem(tr("Use glFinish"), QStringLiteral("UseGLFinish"));
break;
}
}
}
void PreferencesBehaviorTab::Accept(MultiUndoCommand *command)
{
Q_UNUSED(command)
for (auto iterator = config_map_.begin(); iterator != config_map_.end();
iterator++) {
OLIVE_CONFIG_STR(iterator.value()) =
(iterator.key()->checkState(0) == Qt::Checked);
for (auto it = config_map_.cbegin(); it != config_map_.cend(); ++it) {
OLIVE_CONFIG_STR(it.value()) = it.key()->isChecked();
}
if (graphics_backend_combobox_) {
OLIVE_CONFIG("GraphicsBackend") =
graphics_backend_combobox_->currentData().toString();
}
}
QTreeWidgetItem *PreferencesBehaviorTab::AddItem(const QString &text,
void PreferencesBehaviorTab::AddItems(const QVector<Item> &items)
{
for (const Item &i : items) {
AddItem(i.text, i.config_key, i.tooltip);
}
}
QCheckBox *PreferencesBehaviorTab::AddItem(const QString &text,
const QString &config_key,
const QString &tooltip,
QTreeWidgetItem *parent)
const QString &tooltip)
{
QTreeWidgetItem *item = new QTreeWidgetItem({ text });
item->setToolTip(0, tooltip);
item->setCheckState(
0, OLIVE_CONFIG_STR(config_key).toBool() ? Qt::Checked : Qt::Unchecked);
QCheckBox *checkbox = new QCheckBox(text);
checkbox->setToolTip(tooltip);
checkbox->setChecked(OLIVE_CONFIG_STR(config_key).toBool());
config_map_.insert(item, config_key);
config_map_.insert(checkbox, config_key);
if (parent) {
parent->addChild(item);
} else {
behavior_tree_->addTopLevelItem(item);
}
layout()->addWidget(checkbox);
return item;
}
QTreeWidgetItem *PreferencesBehaviorTab::AddItem(const QString &text,
const QString &config_key,
QTreeWidgetItem *parent)
{
return AddItem(text, config_key, QString(), parent);
}
QTreeWidgetItem *PreferencesBehaviorTab::AddParent(const QString &text,
const QString &tooltip,
QTreeWidgetItem *parent)
{
QTreeWidgetItem *item = new QTreeWidgetItem({ text });
item->setToolTip(0, tooltip);
if (parent) {
parent->addChild(item);
} else {
behavior_tree_->addTopLevelItem(item);
}
return item;
}
QTreeWidgetItem *PreferencesBehaviorTab::AddParent(const QString &text,
QTreeWidgetItem *parent)
{
return AddParent(text, QString(), parent);
return checkbox;
}
}
app/dialog/preferences/tabs/preferencesbehaviortab.h
+23 -12
View File
@@ -22,8 +22,9 @@
#ifndef PREFERENCESBEHAVIORTAB_H
#define PREFERENCESBEHAVIORTAB_H
#include <QCheckBox>
#include <QComboBox>
#include <QTreeWidget>
#include <QVBoxLayout>
#include "dialog/configbase/configdialogbase.h"
@@ -33,26 +34,36 @@ namespace olive
class PreferencesBehaviorTab : public ConfigDialogBaseTab {
Q_OBJECT
public:
PreferencesBehaviorTab();
enum Category {
kCategoryGeneral,
kCategoryAudio,
kCategoryTimeline,
kCategoryPlayback,
kCategoryProject,
kCategoryNodes,
kCategoryRendering
};
PreferencesBehaviorTab(Category category);
virtual void Accept(MultiUndoCommand *command) override;
private:
QTreeWidgetItem *AddParent(const QString &text, const QString &tooltip,
QTreeWidgetItem *parent = nullptr);
QTreeWidgetItem *AddParent(const QString &text,
QTreeWidgetItem *parent = nullptr);
struct Item {
QString text;
QString config_key;
QString tooltip;
};
QTreeWidgetItem *AddItem(const QString &text, const QString &config_key,
const QString &tooltip, QTreeWidgetItem *parent);
QTreeWidgetItem *AddItem(const QString &text, const QString &config_key,
QTreeWidgetItem *parent);
void AddItems(const QVector<Item> &items);
QCheckBox *AddItem(const QString &text, const QString &config_key,
const QString &tooltip = QString());
QMap<QTreeWidgetItem *, QString> config_map_;
QMap<QCheckBox *, QString> config_map_;
QComboBox *graphics_backend_combobox_;
QTreeWidget *behavior_tree_;
Category category_;
};
}
app/widget/nodeview/nodeview.cpp
+4
View File
@@ -652,6 +652,10 @@ void NodeView::mouseDoubleClickEvent(QMouseEvent *event)
panel->setFocus(Qt::OtherFocusReason);
}
}
// Scroll the parameter editor to this node
emit NodeSelectionChangedWithContexts(
{ { item_at_cursor->GetNode(), item_at_cursor->GetContext() } });
}
}
}