GUI M8d
This commit is contained in:
parent
e649dea9c1
commit
a07f94c93d
10 changed files with 718 additions and 25 deletions
|
|
@ -1,5 +1,6 @@
|
|||
#include "GraphEditorWidget.h"
|
||||
#include "PresetManager.h"
|
||||
#include "VolumeWidgets.h"
|
||||
#include "WarpGraphModel.h"
|
||||
|
||||
#include <QtNodes/BasicGraphicsScene>
|
||||
|
|
@ -19,6 +20,7 @@
|
|||
#include <QGraphicsItem>
|
||||
#include <QGuiApplication>
|
||||
#include <QInputDialog>
|
||||
#include <QLabel>
|
||||
#include <QMouseEvent>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
|
|
@ -29,6 +31,7 @@
|
|||
#include <QMimeData>
|
||||
#include <QPixmap>
|
||||
#include <QPushButton>
|
||||
#include <QScrollArea>
|
||||
#include <QSplitter>
|
||||
#include <QStandardPaths>
|
||||
#include <QStatusBar>
|
||||
|
|
@ -120,6 +123,32 @@ private:
|
|||
std::vector<Snapshot> m_snapshots;
|
||||
};
|
||||
|
||||
class VolumeChangeCommand : public QUndoCommand {
|
||||
public:
|
||||
VolumeChangeCommand(WarpGraphModel *model, QtNodes::NodeId nodeId,
|
||||
WarpGraphModel::NodeVolumeState previous,
|
||||
WarpGraphModel::NodeVolumeState next)
|
||||
: m_model(model), m_nodeId(nodeId), m_previous(previous), m_next(next) {
|
||||
setText(QStringLiteral("Volume Change"));
|
||||
}
|
||||
|
||||
void undo() override {
|
||||
if (m_model)
|
||||
m_model->setNodeVolumeState(m_nodeId, m_previous);
|
||||
}
|
||||
|
||||
void redo() override {
|
||||
if (m_model)
|
||||
m_model->setNodeVolumeState(m_nodeId, m_next);
|
||||
}
|
||||
|
||||
private:
|
||||
WarpGraphModel *m_model = nullptr;
|
||||
QtNodes::NodeId m_nodeId;
|
||||
WarpGraphModel::NodeVolumeState m_previous;
|
||||
WarpGraphModel::NodeVolumeState m_next;
|
||||
};
|
||||
|
||||
GraphEditorWidget::GraphEditorWidget(warppipe::Client *client,
|
||||
QWidget *parent)
|
||||
: QWidget(parent), m_client(client) {
|
||||
|
|
@ -190,6 +219,22 @@ GraphEditorWidget::GraphEditorWidget(warppipe::Client *client,
|
|||
|
||||
m_sidebar->addTab(presetsTab, QStringLiteral("PRESETS"));
|
||||
|
||||
m_mixerScroll = new QScrollArea();
|
||||
m_mixerScroll->setWidgetResizable(true);
|
||||
m_mixerScroll->setStyleSheet(QStringLiteral(
|
||||
"QScrollArea { background: #1a1a1e; border: none; }"
|
||||
"QScrollBar:vertical { background: #1a1a1e; width: 8px; }"
|
||||
"QScrollBar::handle:vertical { background: #3a3a44; border-radius: 4px; }"
|
||||
"QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }"));
|
||||
m_mixerContainer = new QWidget();
|
||||
m_mixerContainer->setStyleSheet(QStringLiteral("background: #1a1a1e;"));
|
||||
auto *mixerLayout = new QVBoxLayout(m_mixerContainer);
|
||||
mixerLayout->setContentsMargins(4, 4, 4, 4);
|
||||
mixerLayout->setSpacing(2);
|
||||
mixerLayout->addStretch();
|
||||
m_mixerScroll->setWidget(m_mixerContainer);
|
||||
m_sidebar->addTab(m_mixerScroll, QStringLiteral("MIXER"));
|
||||
|
||||
m_splitter = new QSplitter(Qt::Horizontal);
|
||||
m_splitter->addWidget(m_view);
|
||||
m_splitter->addWidget(m_sidebar);
|
||||
|
|
@ -305,6 +350,17 @@ GraphEditorWidget::GraphEditorWidget(warppipe::Client *client,
|
|||
connect(m_model, &QtNodes::AbstractGraphModel::nodeUpdated, this,
|
||||
&GraphEditorWidget::scheduleSaveLayout);
|
||||
|
||||
connect(m_model, &QtNodes::AbstractGraphModel::nodeCreated, this,
|
||||
[this](QtNodes::NodeId nodeId) {
|
||||
wireVolumeWidget(nodeId);
|
||||
rebuildMixerStrips();
|
||||
});
|
||||
connect(m_model, &QtNodes::AbstractGraphModel::nodeDeleted, this,
|
||||
[this](QtNodes::NodeId nodeId) {
|
||||
m_mixerStrips.erase(nodeId);
|
||||
rebuildMixerStrips();
|
||||
});
|
||||
|
||||
m_saveTimer = new QTimer(this);
|
||||
m_saveTimer->setSingleShot(true);
|
||||
m_saveTimer->setInterval(1000);
|
||||
|
|
@ -994,3 +1050,165 @@ void GraphEditorWidget::loadPreset() {
|
|||
QStringLiteral("Failed to load preset."));
|
||||
}
|
||||
}
|
||||
|
||||
void GraphEditorWidget::wireVolumeWidget(QtNodes::NodeId nodeId) {
|
||||
auto widget =
|
||||
m_model->nodeData(nodeId, QtNodes::NodeRole::Widget);
|
||||
auto *w = widget.value<QWidget *>();
|
||||
auto *vol = qobject_cast<NodeVolumeWidget *>(w);
|
||||
if (!vol)
|
||||
return;
|
||||
|
||||
auto capturedId = nodeId;
|
||||
|
||||
connect(vol, &NodeVolumeWidget::volumeChanged, this,
|
||||
[this, capturedId](int value) {
|
||||
auto state = m_model->nodeVolumeState(capturedId);
|
||||
state.volume = static_cast<float>(value) / 100.0f;
|
||||
m_model->setNodeVolumeState(capturedId, state);
|
||||
});
|
||||
|
||||
connect(vol, &NodeVolumeWidget::sliderReleased, this,
|
||||
[this, capturedId, vol]() {
|
||||
auto current = m_model->nodeVolumeState(capturedId);
|
||||
WarpGraphModel::NodeVolumeState previous;
|
||||
previous.volume = current.volume;
|
||||
previous.mute = current.mute;
|
||||
m_scene->undoStack().push(
|
||||
new VolumeChangeCommand(m_model, capturedId, previous, current));
|
||||
});
|
||||
|
||||
connect(vol, &NodeVolumeWidget::muteToggled, this,
|
||||
[this, capturedId](bool muted) {
|
||||
auto previous = m_model->nodeVolumeState(capturedId);
|
||||
auto next = previous;
|
||||
next.mute = muted;
|
||||
m_model->setNodeVolumeState(capturedId, next);
|
||||
m_scene->undoStack().push(
|
||||
new VolumeChangeCommand(m_model, capturedId, previous, next));
|
||||
});
|
||||
}
|
||||
|
||||
void GraphEditorWidget::rebuildMixerStrips() {
|
||||
if (!m_mixerContainer)
|
||||
return;
|
||||
|
||||
auto *layout = m_mixerContainer->layout();
|
||||
if (!layout)
|
||||
return;
|
||||
|
||||
while (layout->count() > 0) {
|
||||
auto *item = layout->takeAt(0);
|
||||
if (item->widget())
|
||||
item->widget()->deleteLater();
|
||||
delete item;
|
||||
}
|
||||
m_mixerStrips.clear();
|
||||
|
||||
auto nodeIds = m_model->allNodeIds();
|
||||
std::vector<QtNodes::NodeId> sorted(nodeIds.begin(), nodeIds.end());
|
||||
std::sort(sorted.begin(), sorted.end());
|
||||
|
||||
for (auto nodeId : sorted) {
|
||||
const WarpNodeData *data = m_model->warpNodeData(nodeId);
|
||||
if (!data)
|
||||
continue;
|
||||
|
||||
auto *strip = new QWidget();
|
||||
strip->setStyleSheet(QStringLiteral(
|
||||
"QWidget { background: #24242a; border-radius: 4px; }"));
|
||||
|
||||
auto *stripLayout = new QHBoxLayout(strip);
|
||||
stripLayout->setContentsMargins(6, 4, 6, 4);
|
||||
stripLayout->setSpacing(6);
|
||||
|
||||
auto *label = new QLabel(
|
||||
WarpGraphModel::classifyNode(data->info) == WarpNodeType::kApplication
|
||||
? QString::fromStdString(
|
||||
data->info.application_name.empty()
|
||||
? data->info.name
|
||||
: data->info.application_name)
|
||||
: QString::fromStdString(
|
||||
data->info.description.empty()
|
||||
? data->info.name
|
||||
: data->info.description));
|
||||
label->setFixedWidth(120);
|
||||
label->setStyleSheet(QStringLiteral(
|
||||
"QLabel { color: #a0a8b6; font-size: 11px; background: transparent; }"));
|
||||
label->setToolTip(QString::fromStdString(data->info.name));
|
||||
|
||||
auto *slider = new ClickSlider(Qt::Horizontal);
|
||||
slider->setRange(0, 100);
|
||||
auto state = m_model->nodeVolumeState(nodeId);
|
||||
slider->setValue(static_cast<int>(state.volume * 100.0f));
|
||||
slider->setStyleSheet(QStringLiteral(
|
||||
"QSlider::groove:horizontal {"
|
||||
" background: #1a1a1e; border-radius: 3px; height: 6px; }"
|
||||
"QSlider::handle:horizontal {"
|
||||
" background: #ecf0f6; border-radius: 5px;"
|
||||
" width: 10px; margin: -4px 0; }"
|
||||
"QSlider::sub-page:horizontal {"
|
||||
" background: #4caf50; border-radius: 3px; }"));
|
||||
|
||||
auto *muteBtn = new QToolButton();
|
||||
muteBtn->setText(QStringLiteral("M"));
|
||||
muteBtn->setCheckable(true);
|
||||
muteBtn->setChecked(state.mute);
|
||||
muteBtn->setFixedSize(22, 22);
|
||||
muteBtn->setStyleSheet(QStringLiteral(
|
||||
"QToolButton {"
|
||||
" background: #2e2e36; color: #ecf0f6; border: 1px solid #3a3a44;"
|
||||
" border-radius: 4px; font-weight: bold; font-size: 11px; }"
|
||||
"QToolButton:checked {"
|
||||
" background: #b03030; color: #ecf0f6; border: 1px solid #d04040; }"
|
||||
"QToolButton:hover { background: #3a3a44; }"
|
||||
"QToolButton:checked:hover { background: #c04040; }"));
|
||||
|
||||
stripLayout->addWidget(label);
|
||||
stripLayout->addWidget(slider, 1);
|
||||
stripLayout->addWidget(muteBtn);
|
||||
|
||||
auto capturedId = nodeId;
|
||||
|
||||
connect(slider, &QSlider::valueChanged, this,
|
||||
[this, capturedId](int value) {
|
||||
auto s = m_model->nodeVolumeState(capturedId);
|
||||
s.volume = static_cast<float>(value) / 100.0f;
|
||||
m_model->setNodeVolumeState(capturedId, s);
|
||||
});
|
||||
|
||||
connect(slider, &QSlider::sliderReleased, this,
|
||||
[this, capturedId]() {
|
||||
auto current = m_model->nodeVolumeState(capturedId);
|
||||
m_scene->undoStack().push(
|
||||
new VolumeChangeCommand(m_model, capturedId, current, current));
|
||||
});
|
||||
|
||||
connect(muteBtn, &QToolButton::toggled, this,
|
||||
[this, capturedId](bool muted) {
|
||||
auto prev = m_model->nodeVolumeState(capturedId);
|
||||
auto next = prev;
|
||||
next.mute = muted;
|
||||
m_model->setNodeVolumeState(capturedId, next);
|
||||
m_scene->undoStack().push(
|
||||
new VolumeChangeCommand(m_model, capturedId, prev, next));
|
||||
});
|
||||
|
||||
connect(m_model, &WarpGraphModel::nodeVolumeChanged, slider,
|
||||
[slider, muteBtn, capturedId](QtNodes::NodeId id,
|
||||
WarpGraphModel::NodeVolumeState,
|
||||
WarpGraphModel::NodeVolumeState cur) {
|
||||
if (id != capturedId)
|
||||
return;
|
||||
QSignalBlocker sb(slider);
|
||||
QSignalBlocker mb(muteBtn);
|
||||
slider->setValue(static_cast<int>(cur.volume * 100.0f));
|
||||
muteBtn->setChecked(cur.mute);
|
||||
});
|
||||
|
||||
layout->addWidget(strip);
|
||||
m_mixerStrips[nodeId] = strip;
|
||||
}
|
||||
|
||||
static_cast<QVBoxLayout *>(layout)->addStretch();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue