change: change code style to Linux style except indent.
This commit is contained in:
@@ -28,111 +28,115 @@
|
||||
|
||||
#include "trackviewitem.h"
|
||||
|
||||
namespace olive {
|
||||
|
||||
TrackView::TrackView(Qt::Alignment vertical_alignment, QWidget *parent) :
|
||||
QScrollArea(parent),
|
||||
list_(nullptr),
|
||||
alignment_(vertical_alignment)
|
||||
namespace olive
|
||||
{
|
||||
setAlignment(Qt::AlignLeft | alignment_);
|
||||
|
||||
QWidget* central = new QWidget();
|
||||
setWidget(central);
|
||||
setWidgetResizable(true);
|
||||
TrackView::TrackView(Qt::Alignment vertical_alignment, QWidget *parent)
|
||||
: QScrollArea(parent)
|
||||
, list_(nullptr)
|
||||
, alignment_(vertical_alignment)
|
||||
{
|
||||
setAlignment(Qt::AlignLeft | alignment_);
|
||||
|
||||
QVBoxLayout* layout = new QVBoxLayout(central);
|
||||
layout->setContentsMargins(0, 0, 0, 0);
|
||||
layout->setSpacing(0);
|
||||
QWidget *central = new QWidget();
|
||||
setWidget(central);
|
||||
setWidgetResizable(true);
|
||||
|
||||
if (alignment_ == Qt::AlignBottom) {
|
||||
layout->addStretch();
|
||||
QVBoxLayout *layout = new QVBoxLayout(central);
|
||||
layout->setContentsMargins(0, 0, 0, 0);
|
||||
layout->setSpacing(0);
|
||||
|
||||
connect(verticalScrollBar(), &QScrollBar::rangeChanged, this, &TrackView::ScrollbarRangeChanged);
|
||||
last_scrollbar_max_ = verticalScrollBar()->maximum();
|
||||
}
|
||||
if (alignment_ == Qt::AlignBottom) {
|
||||
layout->addStretch();
|
||||
|
||||
splitter_ = new TrackViewSplitter(alignment_);
|
||||
splitter_->setChildrenCollapsible(false);
|
||||
layout->addWidget(splitter_);
|
||||
connect(verticalScrollBar(), &QScrollBar::rangeChanged, this,
|
||||
&TrackView::ScrollbarRangeChanged);
|
||||
last_scrollbar_max_ = verticalScrollBar()->maximum();
|
||||
}
|
||||
|
||||
if (alignment_ == Qt::AlignTop) {
|
||||
layout->addStretch();
|
||||
}
|
||||
splitter_ = new TrackViewSplitter(alignment_);
|
||||
splitter_->setChildrenCollapsible(false);
|
||||
layout->addWidget(splitter_);
|
||||
|
||||
connect(splitter_, &TrackViewSplitter::TrackHeightChanged, this, &TrackView::TrackHeightChanged);
|
||||
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
|
||||
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
|
||||
if (alignment_ == Qt::AlignTop) {
|
||||
layout->addStretch();
|
||||
}
|
||||
|
||||
connect(splitter_, &TrackViewSplitter::TrackHeightChanged, this,
|
||||
&TrackView::TrackHeightChanged);
|
||||
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
|
||||
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
|
||||
}
|
||||
|
||||
void TrackView::ConnectTrackList(TrackList *list)
|
||||
{
|
||||
if (list_ != nullptr) {
|
||||
// Remove tracks
|
||||
for (int i=0; i<list_->GetTrackCount(); i++) {
|
||||
splitter_->Remove(0);
|
||||
}
|
||||
if (list_ != nullptr) {
|
||||
// Remove tracks
|
||||
for (int i = 0; i < list_->GetTrackCount(); i++) {
|
||||
splitter_->Remove(0);
|
||||
}
|
||||
|
||||
disconnect(list_, &TrackList::TrackAdded, this, &TrackView::InsertTrack);
|
||||
disconnect(list_, &TrackList::TrackRemoved, this, &TrackView::RemoveTrack);
|
||||
}
|
||||
disconnect(list_, &TrackList::TrackAdded, this,
|
||||
&TrackView::InsertTrack);
|
||||
disconnect(list_, &TrackList::TrackRemoved, this,
|
||||
&TrackView::RemoveTrack);
|
||||
}
|
||||
|
||||
list_ = list;
|
||||
list_ = list;
|
||||
|
||||
if (list_ != nullptr) {
|
||||
foreach (Track* track, list_->GetTracks()) {
|
||||
InsertTrack(track);
|
||||
}
|
||||
if (list_ != nullptr) {
|
||||
foreach (Track *track, list_->GetTracks()) {
|
||||
InsertTrack(track);
|
||||
}
|
||||
|
||||
connect(list_, &TrackList::TrackAdded, this, &TrackView::InsertTrack);
|
||||
connect(list_, &TrackList::TrackRemoved, this, &TrackView::RemoveTrack);
|
||||
}
|
||||
connect(list_, &TrackList::TrackAdded, this, &TrackView::InsertTrack);
|
||||
connect(list_, &TrackList::TrackRemoved, this, &TrackView::RemoveTrack);
|
||||
}
|
||||
}
|
||||
|
||||
void TrackView::DisconnectTrackList()
|
||||
{
|
||||
ConnectTrackList(nullptr);
|
||||
ConnectTrackList(nullptr);
|
||||
}
|
||||
|
||||
void TrackView::resizeEvent(QResizeEvent *e)
|
||||
{
|
||||
QScrollArea::resizeEvent(e);
|
||||
QScrollArea::resizeEvent(e);
|
||||
|
||||
splitter_->SetSpacerHeight(height()/2);
|
||||
splitter_->SetSpacerHeight(height() / 2);
|
||||
}
|
||||
|
||||
void TrackView::ScrollbarRangeChanged(int, int max)
|
||||
{
|
||||
if (max != last_scrollbar_max_) {
|
||||
int ba_val = last_scrollbar_max_ - verticalScrollBar()->value();
|
||||
int new_val = max - ba_val;
|
||||
if (max != last_scrollbar_max_) {
|
||||
int ba_val = last_scrollbar_max_ - verticalScrollBar()->value();
|
||||
int new_val = max - ba_val;
|
||||
|
||||
verticalScrollBar()->setValue(new_val);
|
||||
emit verticalScrollBar()->valueChanged(new_val);
|
||||
verticalScrollBar()->setValue(new_val);
|
||||
emit verticalScrollBar() -> valueChanged(new_val);
|
||||
|
||||
last_scrollbar_max_ = max;
|
||||
}
|
||||
last_scrollbar_max_ = max;
|
||||
}
|
||||
}
|
||||
|
||||
void TrackView::TrackHeightChanged(int index, int height)
|
||||
{
|
||||
list_->GetTrackAt(index)->SetTrackHeightInPixels(height);
|
||||
list_->GetTrackAt(index)->SetTrackHeightInPixels(height);
|
||||
}
|
||||
|
||||
void TrackView::InsertTrack(Track *track)
|
||||
{
|
||||
TrackViewItem *tvi = new TrackViewItem(track);
|
||||
TrackViewItem *tvi = new TrackViewItem(track);
|
||||
|
||||
connect(tvi, &TrackViewItem::AboutToDeleteTrack, this, &TrackView::AboutToDeleteTrack);
|
||||
connect(tvi, &TrackViewItem::AboutToDeleteTrack, this,
|
||||
&TrackView::AboutToDeleteTrack);
|
||||
|
||||
splitter_->Insert(track->Index(),
|
||||
track->GetTrackHeightInPixels(),
|
||||
tvi);
|
||||
splitter_->Insert(track->Index(), track->GetTrackHeightInPixels(), tvi);
|
||||
}
|
||||
|
||||
void TrackView::RemoveTrack(Track *track)
|
||||
{
|
||||
splitter_->Remove(track->Index());
|
||||
splitter_->Remove(track->Index());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -28,42 +28,41 @@
|
||||
#include "trackviewitem.h"
|
||||
#include "trackviewsplitter.h"
|
||||
|
||||
namespace olive {
|
||||
|
||||
class TrackView : public QScrollArea
|
||||
namespace olive
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
TrackView(Qt::Alignment vertical_alignment = Qt::AlignTop,
|
||||
QWidget* parent = nullptr);
|
||||
|
||||
void ConnectTrackList(TrackList* list);
|
||||
void DisconnectTrackList();
|
||||
class TrackView : public QScrollArea {
|
||||
Q_OBJECT
|
||||
public:
|
||||
TrackView(Qt::Alignment vertical_alignment = Qt::AlignTop,
|
||||
QWidget *parent = nullptr);
|
||||
|
||||
void ConnectTrackList(TrackList *list);
|
||||
void DisconnectTrackList();
|
||||
|
||||
signals:
|
||||
void AboutToDeleteTrack(Track *track);
|
||||
void AboutToDeleteTrack(Track *track);
|
||||
|
||||
protected:
|
||||
virtual void resizeEvent(QResizeEvent *e) override;
|
||||
virtual void resizeEvent(QResizeEvent *e) override;
|
||||
|
||||
private:
|
||||
TrackList* list_;
|
||||
TrackList *list_;
|
||||
|
||||
TrackViewSplitter* splitter_;
|
||||
TrackViewSplitter *splitter_;
|
||||
|
||||
Qt::Alignment alignment_;
|
||||
Qt::Alignment alignment_;
|
||||
|
||||
int last_scrollbar_max_;
|
||||
int last_scrollbar_max_;
|
||||
|
||||
private slots:
|
||||
void ScrollbarRangeChanged(int min, int max);
|
||||
void ScrollbarRangeChanged(int min, int max);
|
||||
|
||||
void TrackHeightChanged(int index, int height);
|
||||
void TrackHeightChanged(int index, int height);
|
||||
|
||||
void InsertTrack(Track* track);
|
||||
|
||||
void RemoveTrack(Track* track);
|
||||
void InsertTrack(Track *track);
|
||||
|
||||
void RemoveTrack(Track *track);
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -32,159 +32,177 @@
|
||||
#include "ui/icons/icons.h"
|
||||
#include "widget/menu/menu.h"
|
||||
|
||||
namespace olive {
|
||||
|
||||
TrackViewItem::TrackViewItem(Track* track, QWidget *parent) :
|
||||
QWidget(parent),
|
||||
track_(track)
|
||||
namespace olive
|
||||
{
|
||||
QHBoxLayout* layout = new QHBoxLayout(this);
|
||||
layout->setSpacing(0);
|
||||
layout->setContentsMargins(0, 0, 0, 0);
|
||||
|
||||
stack_ = new QStackedWidget();
|
||||
layout->addWidget(stack_);
|
||||
TrackViewItem::TrackViewItem(Track *track, QWidget *parent)
|
||||
: QWidget(parent)
|
||||
, track_(track)
|
||||
{
|
||||
QHBoxLayout *layout = new QHBoxLayout(this);
|
||||
layout->setSpacing(0);
|
||||
layout->setContentsMargins(0, 0, 0, 0);
|
||||
|
||||
label_ = new ClickableLabel();
|
||||
connect(label_, &ClickableLabel::MouseDoubleClicked, this, &TrackViewItem::LabelClicked);
|
||||
connect(track_, &Track::LabelChanged, this, &TrackViewItem::UpdateLabel);
|
||||
connect(track_, &Track::IndexChanged, this, &TrackViewItem::UpdateLabel);
|
||||
UpdateLabel();
|
||||
stack_->addWidget(label_);
|
||||
stack_ = new QStackedWidget();
|
||||
layout->addWidget(stack_);
|
||||
|
||||
line_edit_ = new FocusableLineEdit();
|
||||
connect(line_edit_, &FocusableLineEdit::Confirmed, this, &TrackViewItem::LineEditConfirmed);
|
||||
connect(line_edit_, &FocusableLineEdit::Cancelled, this, &TrackViewItem::LineEditCancelled);
|
||||
stack_->addWidget(line_edit_);
|
||||
label_ = new ClickableLabel();
|
||||
connect(label_, &ClickableLabel::MouseDoubleClicked, this,
|
||||
&TrackViewItem::LabelClicked);
|
||||
connect(track_, &Track::LabelChanged, this, &TrackViewItem::UpdateLabel);
|
||||
connect(track_, &Track::IndexChanged, this, &TrackViewItem::UpdateLabel);
|
||||
UpdateLabel();
|
||||
stack_->addWidget(label_);
|
||||
|
||||
mute_button_ = CreateMSLButton(Qt::red);
|
||||
mute_button_->setChecked(track->IsMuted());
|
||||
UpdateMuteButton(track->IsMuted());
|
||||
connect(mute_button_, &QPushButton::toggled, track_, &Track::SetMuted);
|
||||
connect(mute_button_, &QPushButton::toggled, this, &TrackViewItem::UpdateMuteButton);
|
||||
layout->addWidget(mute_button_);
|
||||
line_edit_ = new FocusableLineEdit();
|
||||
connect(line_edit_, &FocusableLineEdit::Confirmed, this,
|
||||
&TrackViewItem::LineEditConfirmed);
|
||||
connect(line_edit_, &FocusableLineEdit::Cancelled, this,
|
||||
&TrackViewItem::LineEditCancelled);
|
||||
stack_->addWidget(line_edit_);
|
||||
|
||||
/*solo_button_ = CreateMSLButton(tr("S"), Qt::yellow);
|
||||
mute_button_ = CreateMSLButton(Qt::red);
|
||||
mute_button_->setChecked(track->IsMuted());
|
||||
UpdateMuteButton(track->IsMuted());
|
||||
connect(mute_button_, &QPushButton::toggled, track_, &Track::SetMuted);
|
||||
connect(mute_button_, &QPushButton::toggled, this,
|
||||
&TrackViewItem::UpdateMuteButton);
|
||||
layout->addWidget(mute_button_);
|
||||
|
||||
/*solo_button_ = CreateMSLButton(tr("S"), Qt::yellow);
|
||||
layout->addWidget(solo_button_);*/
|
||||
|
||||
lock_button_ = CreateMSLButton(Qt::gray);
|
||||
lock_button_->setChecked(track->IsLocked());
|
||||
UpdateLockButton(track->IsLocked());
|
||||
connect(lock_button_, &QPushButton::toggled, track_, &Track::SetLocked);
|
||||
connect(lock_button_, &QPushButton::toggled, this, &TrackViewItem::UpdateLockButton);
|
||||
layout->addWidget(lock_button_);
|
||||
lock_button_ = CreateMSLButton(Qt::gray);
|
||||
lock_button_->setChecked(track->IsLocked());
|
||||
UpdateLockButton(track->IsLocked());
|
||||
connect(lock_button_, &QPushButton::toggled, track_, &Track::SetLocked);
|
||||
connect(lock_button_, &QPushButton::toggled, this,
|
||||
&TrackViewItem::UpdateLockButton);
|
||||
layout->addWidget(lock_button_);
|
||||
|
||||
setMinimumHeight(mute_button_->height());
|
||||
setContextMenuPolicy(Qt::CustomContextMenu);
|
||||
setMinimumHeight(mute_button_->height());
|
||||
setContextMenuPolicy(Qt::CustomContextMenu);
|
||||
|
||||
connect(track, &Track::MutedChanged, mute_button_, &QPushButton::setChecked);
|
||||
connect(this, &QWidget::customContextMenuRequested, this, &TrackViewItem::ShowContextMenu);
|
||||
connect(track, &Track::MutedChanged, mute_button_,
|
||||
&QPushButton::setChecked);
|
||||
connect(this, &QWidget::customContextMenuRequested, this,
|
||||
&TrackViewItem::ShowContextMenu);
|
||||
}
|
||||
|
||||
QPushButton *TrackViewItem::CreateMSLButton(const QColor& checked_color) const
|
||||
QPushButton *TrackViewItem::CreateMSLButton(const QColor &checked_color) const
|
||||
{
|
||||
QPushButton* button = new QPushButton();
|
||||
button->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
|
||||
button->setCheckable(true);
|
||||
button->setStyleSheet(QStringLiteral("QPushButton::checked { background: %1; }").arg(checked_color.name()));
|
||||
QPushButton *button = new QPushButton();
|
||||
button->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
|
||||
button->setCheckable(true);
|
||||
button->setStyleSheet(
|
||||
QStringLiteral("QPushButton::checked { background: %1; }")
|
||||
.arg(checked_color.name()));
|
||||
|
||||
int size = button->sizeHint().height();
|
||||
size = qRound(size * 0.75);
|
||||
button->setFixedSize(size, size);
|
||||
int size = button->sizeHint().height();
|
||||
size = qRound(size * 0.75);
|
||||
button->setFixedSize(size, size);
|
||||
|
||||
return button;
|
||||
return button;
|
||||
}
|
||||
|
||||
void TrackViewItem::LabelClicked()
|
||||
{
|
||||
stack_->setCurrentWidget(line_edit_);
|
||||
line_edit_->setFocus();
|
||||
line_edit_->selectAll();
|
||||
stack_->setCurrentWidget(line_edit_);
|
||||
line_edit_->setFocus();
|
||||
line_edit_->selectAll();
|
||||
}
|
||||
|
||||
void TrackViewItem::LineEditConfirmed()
|
||||
{
|
||||
line_edit_->blockSignals(true);
|
||||
line_edit_->blockSignals(true);
|
||||
|
||||
track_->SetLabel(line_edit_->text());
|
||||
UpdateLabel();
|
||||
track_->SetLabel(line_edit_->text());
|
||||
UpdateLabel();
|
||||
|
||||
stack_->setCurrentWidget(label_);
|
||||
stack_->setCurrentWidget(label_);
|
||||
|
||||
line_edit_->blockSignals(false);
|
||||
line_edit_->blockSignals(false);
|
||||
}
|
||||
|
||||
void TrackViewItem::LineEditCancelled()
|
||||
{
|
||||
line_edit_->blockSignals(true);
|
||||
line_edit_->blockSignals(true);
|
||||
|
||||
stack_->setCurrentWidget(label_);
|
||||
stack_->setCurrentWidget(label_);
|
||||
|
||||
line_edit_->blockSignals(false);
|
||||
line_edit_->blockSignals(false);
|
||||
}
|
||||
|
||||
void TrackViewItem::UpdateLabel()
|
||||
{
|
||||
label_->setText(track_->GetLabelOrName());
|
||||
label_->setText(track_->GetLabelOrName());
|
||||
}
|
||||
|
||||
void TrackViewItem::ShowContextMenu(const QPoint &p)
|
||||
{
|
||||
Menu m(this);
|
||||
Menu m(this);
|
||||
|
||||
QAction *delete_action = m.addAction(tr("&Delete"));
|
||||
connect(delete_action, &QAction::triggered, this, &TrackViewItem::DeleteTrack, Qt::QueuedConnection);
|
||||
QAction *delete_action = m.addAction(tr("&Delete"));
|
||||
connect(delete_action, &QAction::triggered, this,
|
||||
&TrackViewItem::DeleteTrack, Qt::QueuedConnection);
|
||||
|
||||
m.addSeparator();
|
||||
m.addSeparator();
|
||||
|
||||
QAction *delete_unused_action = m.addAction(tr("Delete All &Empty"));
|
||||
connect(delete_unused_action, &QAction::triggered, this, &TrackViewItem::DeleteAllEmptyTracks, Qt::QueuedConnection);
|
||||
QAction *delete_unused_action = m.addAction(tr("Delete All &Empty"));
|
||||
connect(delete_unused_action, &QAction::triggered, this,
|
||||
&TrackViewItem::DeleteAllEmptyTracks, Qt::QueuedConnection);
|
||||
|
||||
m.exec(mapToGlobal(p));
|
||||
m.exec(mapToGlobal(p));
|
||||
}
|
||||
|
||||
void TrackViewItem::DeleteTrack()
|
||||
{
|
||||
emit AboutToDeleteTrack(track_);
|
||||
Core::instance()->undo_stack()->push(new TimelineRemoveTrackCommand(track_), tr("Deleted Track \"%1\"").arg(track_->GetLabelOrName()));
|
||||
emit AboutToDeleteTrack(track_);
|
||||
Core::instance()->undo_stack()->push(
|
||||
new TimelineRemoveTrackCommand(track_),
|
||||
tr("Deleted Track \"%1\"").arg(track_->GetLabelOrName()));
|
||||
}
|
||||
|
||||
void TrackViewItem::DeleteAllEmptyTracks()
|
||||
{
|
||||
Sequence *sequence = track_->sequence();
|
||||
QVector<Track*> tracks_to_remove;
|
||||
QStringList track_names_to_remove;
|
||||
Sequence *sequence = track_->sequence();
|
||||
QVector<Track *> tracks_to_remove;
|
||||
QStringList track_names_to_remove;
|
||||
|
||||
foreach (Track *t, sequence->GetTracks()) {
|
||||
if (t->Blocks().isEmpty()) {
|
||||
tracks_to_remove.append(t);
|
||||
track_names_to_remove.append(t->GetLabelOrName());
|
||||
}
|
||||
}
|
||||
foreach (Track *t, sequence->GetTracks()) {
|
||||
if (t->Blocks().isEmpty()) {
|
||||
tracks_to_remove.append(t);
|
||||
track_names_to_remove.append(t->GetLabelOrName());
|
||||
}
|
||||
}
|
||||
|
||||
if (tracks_to_remove.isEmpty()) {
|
||||
QMessageBox::information(this, tr("Delete All Empty"), tr("No tracks are currently empty"));
|
||||
} else {
|
||||
if (QMessageBox::question(this, tr("Delete All Empty"),
|
||||
tr("This will delete the following tracks:\n\n%1\n\nDo you wish to continue?").arg(track_names_to_remove.join('\n')),
|
||||
QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok) {
|
||||
MultiUndoCommand *command = new MultiUndoCommand();
|
||||
foreach (Track *track, tracks_to_remove) {
|
||||
command->add_child(new TimelineRemoveTrackCommand(track));
|
||||
}
|
||||
Core::instance()->undo_stack()->push(command, tr("Deleted All Empty Tracks"));
|
||||
}
|
||||
}
|
||||
if (tracks_to_remove.isEmpty()) {
|
||||
QMessageBox::information(this, tr("Delete All Empty"),
|
||||
tr("No tracks are currently empty"));
|
||||
} else {
|
||||
if (QMessageBox::question(
|
||||
this, tr("Delete All Empty"),
|
||||
tr("This will delete the following tracks:\n\n%1\n\nDo you wish to continue?")
|
||||
.arg(track_names_to_remove.join('\n')),
|
||||
QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok) {
|
||||
MultiUndoCommand *command = new MultiUndoCommand();
|
||||
foreach (Track *track, tracks_to_remove) {
|
||||
command->add_child(new TimelineRemoveTrackCommand(track));
|
||||
}
|
||||
Core::instance()->undo_stack()->push(
|
||||
command, tr("Deleted All Empty Tracks"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void TrackViewItem::UpdateMuteButton(bool e)
|
||||
{
|
||||
mute_button_->setIcon(e ? icon::EyeClosed : icon::EyeOpened);
|
||||
mute_button_->setIcon(e ? icon::EyeClosed : icon::EyeOpened);
|
||||
}
|
||||
|
||||
void TrackViewItem::UpdateLockButton(bool e)
|
||||
{
|
||||
lock_button_->setIcon(e ? icon::LockClosed : icon::LockOpened);
|
||||
lock_button_->setIcon(e ? icon::LockClosed : icon::LockOpened);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -30,51 +30,49 @@
|
||||
#include "widget/focusablelineedit/focusablelineedit.h"
|
||||
#include "widget/timelinewidget/view/timelineviewmouseevent.h"
|
||||
|
||||
namespace olive {
|
||||
|
||||
class TrackViewItem : public QWidget
|
||||
namespace olive
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
class TrackViewItem : public QWidget {
|
||||
Q_OBJECT
|
||||
public:
|
||||
TrackViewItem(Track* track,
|
||||
QWidget* parent = nullptr);
|
||||
TrackViewItem(Track *track, QWidget *parent = nullptr);
|
||||
|
||||
signals:
|
||||
void AboutToDeleteTrack(Track *track);
|
||||
void AboutToDeleteTrack(Track *track);
|
||||
|
||||
private:
|
||||
QPushButton* CreateMSLButton(const QColor &checked_color) const;
|
||||
QPushButton *CreateMSLButton(const QColor &checked_color) const;
|
||||
|
||||
QStackedWidget* stack_;
|
||||
QStackedWidget *stack_;
|
||||
|
||||
ClickableLabel* label_;
|
||||
FocusableLineEdit* line_edit_;
|
||||
ClickableLabel *label_;
|
||||
FocusableLineEdit *line_edit_;
|
||||
|
||||
QPushButton* mute_button_;
|
||||
QPushButton* solo_button_;
|
||||
QPushButton* lock_button_;
|
||||
QPushButton *mute_button_;
|
||||
QPushButton *solo_button_;
|
||||
QPushButton *lock_button_;
|
||||
|
||||
Track* track_;
|
||||
Track *track_;
|
||||
|
||||
private slots:
|
||||
void LabelClicked();
|
||||
void LabelClicked();
|
||||
|
||||
void LineEditConfirmed();
|
||||
void LineEditConfirmed();
|
||||
|
||||
void LineEditCancelled();
|
||||
void LineEditCancelled();
|
||||
|
||||
void UpdateLabel();
|
||||
void UpdateLabel();
|
||||
|
||||
void ShowContextMenu(const QPoint &p);
|
||||
void ShowContextMenu(const QPoint &p);
|
||||
|
||||
void DeleteTrack();
|
||||
void DeleteTrack();
|
||||
|
||||
void DeleteAllEmptyTracks();
|
||||
void DeleteAllEmptyTracks();
|
||||
|
||||
void UpdateMuteButton(bool e);
|
||||
|
||||
void UpdateLockButton(bool e);
|
||||
void UpdateMuteButton(bool e);
|
||||
|
||||
void UpdateLockButton(bool e);
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -25,145 +25,148 @@
|
||||
|
||||
#include "node/output/track/track.h"
|
||||
|
||||
namespace olive {
|
||||
|
||||
TrackViewSplitter::TrackViewSplitter(Qt::Alignment vertical_alignment, QWidget* parent) :
|
||||
QSplitter(Qt::Vertical, parent),
|
||||
alignment_(vertical_alignment),
|
||||
spacer_height_(0)
|
||||
namespace olive
|
||||
{
|
||||
setHandleWidth(1);
|
||||
|
||||
int initial_height = 0;
|
||||
TrackViewSplitter::TrackViewSplitter(Qt::Alignment vertical_alignment,
|
||||
QWidget *parent)
|
||||
: QSplitter(Qt::Vertical, parent)
|
||||
, alignment_(vertical_alignment)
|
||||
, spacer_height_(0)
|
||||
{
|
||||
setHandleWidth(1);
|
||||
|
||||
// Add empty spacer so we get a splitter handle after the last element
|
||||
QWidget* spacer = new QWidget();
|
||||
addWidget(spacer);
|
||||
int initial_height = 0;
|
||||
|
||||
setFixedHeight(initial_height);
|
||||
// Add empty spacer so we get a splitter handle after the last element
|
||||
QWidget *spacer = new QWidget();
|
||||
addWidget(spacer);
|
||||
|
||||
setFixedHeight(initial_height);
|
||||
}
|
||||
|
||||
void TrackViewSplitter::HandleReceiver(TrackViewSplitterHandle *h, int diff)
|
||||
{
|
||||
int ele_id = -1;
|
||||
int ele_id = -1;
|
||||
|
||||
for (int i=0;i<count();i++) {
|
||||
if (handle(i) == h) {
|
||||
ele_id = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < count(); i++) {
|
||||
if (handle(i) == h) {
|
||||
ele_id = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// The handle index is actually always one above the element index
|
||||
if (alignment_ == Qt::AlignTop) {
|
||||
ele_id--;
|
||||
} else if (alignment_ == Qt::AlignBottom) {
|
||||
diff = -diff;
|
||||
}
|
||||
// The handle index is actually always one above the element index
|
||||
if (alignment_ == Qt::AlignTop) {
|
||||
ele_id--;
|
||||
} else if (alignment_ == Qt::AlignBottom) {
|
||||
diff = -diff;
|
||||
}
|
||||
|
||||
QList<int> element_sizes = sizes();
|
||||
QList<int> element_sizes = sizes();
|
||||
|
||||
int old_ele_sz = element_sizes.at(ele_id);
|
||||
int old_ele_sz = element_sizes.at(ele_id);
|
||||
|
||||
// Transform element size by diff
|
||||
int new_ele_sz = old_ele_sz + diff;
|
||||
// Transform element size by diff
|
||||
int new_ele_sz = old_ele_sz + diff;
|
||||
|
||||
// Limit by track minimum height
|
||||
new_ele_sz = qMax(new_ele_sz, Track::GetMinimumTrackHeightInPixels());
|
||||
// Limit by track minimum height
|
||||
new_ele_sz = qMax(new_ele_sz, Track::GetMinimumTrackHeightInPixels());
|
||||
|
||||
if (alignment_ == Qt::AlignBottom) {
|
||||
ele_id = count() - ele_id - 1;
|
||||
}
|
||||
if (alignment_ == Qt::AlignBottom) {
|
||||
ele_id = count() - ele_id - 1;
|
||||
}
|
||||
|
||||
SetTrackHeight(ele_id, new_ele_sz);
|
||||
SetTrackHeight(ele_id, new_ele_sz);
|
||||
|
||||
emit TrackHeightChanged(ele_id, new_ele_sz);
|
||||
emit TrackHeightChanged(ele_id, new_ele_sz);
|
||||
}
|
||||
|
||||
void TrackViewSplitter::SetTrackHeight(int index, int h)
|
||||
{
|
||||
QList<int> element_sizes = sizes();
|
||||
QList<int> element_sizes = sizes();
|
||||
|
||||
if (alignment_ == Qt::AlignBottom) {
|
||||
index = count() - index - 1;
|
||||
}
|
||||
if (alignment_ == Qt::AlignBottom) {
|
||||
index = count() - index - 1;
|
||||
}
|
||||
|
||||
int old_ele_sz = element_sizes.at(index);
|
||||
int old_ele_sz = element_sizes.at(index);
|
||||
|
||||
int diff = h - old_ele_sz;
|
||||
int diff = h - old_ele_sz;
|
||||
|
||||
// Set new size on element
|
||||
element_sizes.replace(index, h);
|
||||
setSizes(element_sizes);
|
||||
// Set new size on element
|
||||
element_sizes.replace(index, h);
|
||||
setSizes(element_sizes);
|
||||
|
||||
// Increase height by the difference
|
||||
setFixedHeight(height() + diff);
|
||||
// Increase height by the difference
|
||||
setFixedHeight(height() + diff);
|
||||
}
|
||||
|
||||
void TrackViewSplitter::SetHeightWithSizes(QList<int> sizes)
|
||||
{
|
||||
int start_height = 0;
|
||||
int start_height = 0;
|
||||
|
||||
// Add spacer height too
|
||||
if (alignment_ == Qt::AlignBottom) {
|
||||
sizes.replace(0, spacer_height_);
|
||||
} else {
|
||||
sizes.replace(sizes.size() - 1, spacer_height_);
|
||||
}
|
||||
// Add spacer height too
|
||||
if (alignment_ == Qt::AlignBottom) {
|
||||
sizes.replace(0, spacer_height_);
|
||||
} else {
|
||||
sizes.replace(sizes.size() - 1, spacer_height_);
|
||||
}
|
||||
|
||||
foreach (int s, sizes) {
|
||||
start_height += s + handleWidth();
|
||||
}
|
||||
foreach (int s, sizes) {
|
||||
start_height += s + handleWidth();
|
||||
}
|
||||
|
||||
// The spacer doesn't need a handle width
|
||||
start_height -= handleWidth();
|
||||
// The spacer doesn't need a handle width
|
||||
start_height -= handleWidth();
|
||||
|
||||
setFixedHeight(start_height);
|
||||
setSizes(sizes);
|
||||
setFixedHeight(start_height);
|
||||
setSizes(sizes);
|
||||
}
|
||||
|
||||
void TrackViewSplitter::Insert(int index, int height, QWidget *item)
|
||||
{
|
||||
QList<int> sz = sizes();
|
||||
QList<int> sz = sizes();
|
||||
|
||||
if (alignment_ == Qt::AlignBottom) {
|
||||
index = count() - index;
|
||||
}
|
||||
if (alignment_ == Qt::AlignBottom) {
|
||||
index = count() - index;
|
||||
}
|
||||
|
||||
sz.insert(index, height);
|
||||
insertWidget(index, item);
|
||||
sz.insert(index, height);
|
||||
insertWidget(index, item);
|
||||
|
||||
SetHeightWithSizes(sz);
|
||||
SetHeightWithSizes(sz);
|
||||
}
|
||||
|
||||
void TrackViewSplitter::Remove(int index)
|
||||
{
|
||||
QList<int> sz = sizes();
|
||||
QList<int> sz = sizes();
|
||||
|
||||
if (alignment_ == Qt::AlignBottom) {
|
||||
index = count() - 1 - index;
|
||||
}
|
||||
if (alignment_ == Qt::AlignBottom) {
|
||||
index = count() - 1 - index;
|
||||
}
|
||||
|
||||
sz.removeAt(index);
|
||||
delete widget(index);
|
||||
sz.removeAt(index);
|
||||
delete widget(index);
|
||||
|
||||
SetHeightWithSizes(sz);
|
||||
SetHeightWithSizes(sz);
|
||||
}
|
||||
|
||||
void TrackViewSplitter::SetSpacerHeight(int height)
|
||||
{
|
||||
spacer_height_ = height;
|
||||
SetHeightWithSizes(sizes());
|
||||
spacer_height_ = height;
|
||||
SetHeightWithSizes(sizes());
|
||||
}
|
||||
|
||||
QSplitterHandle *TrackViewSplitter::createHandle()
|
||||
{
|
||||
return new TrackViewSplitterHandle(orientation(), this);
|
||||
return new TrackViewSplitterHandle(orientation(), this);
|
||||
}
|
||||
|
||||
TrackViewSplitterHandle::TrackViewSplitterHandle(Qt::Orientation orientation, QSplitter *parent) :
|
||||
QSplitterHandle(orientation, parent),
|
||||
dragging_(false)
|
||||
TrackViewSplitterHandle::TrackViewSplitterHandle(Qt::Orientation orientation,
|
||||
QSplitter *parent)
|
||||
: QSplitterHandle(orientation, parent)
|
||||
, dragging_(false)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -173,23 +176,24 @@ void TrackViewSplitterHandle::mousePressEvent(QMouseEvent *)
|
||||
|
||||
void TrackViewSplitterHandle::mouseMoveEvent(QMouseEvent *)
|
||||
{
|
||||
if (dragging_) {
|
||||
static_cast<TrackViewSplitter*>(parent())->HandleReceiver(this, QCursor::pos().y() - drag_y_);
|
||||
}
|
||||
if (dragging_) {
|
||||
static_cast<TrackViewSplitter *>(parent())->HandleReceiver(
|
||||
this, QCursor::pos().y() - drag_y_);
|
||||
}
|
||||
|
||||
drag_y_ = QCursor::pos().y();
|
||||
dragging_ = true;
|
||||
drag_y_ = QCursor::pos().y();
|
||||
dragging_ = true;
|
||||
}
|
||||
|
||||
void TrackViewSplitterHandle::mouseReleaseEvent(QMouseEvent *)
|
||||
{
|
||||
dragging_ = false;
|
||||
dragging_ = false;
|
||||
}
|
||||
|
||||
void TrackViewSplitterHandle::paintEvent(QPaintEvent *)
|
||||
{
|
||||
QPainter p(this);
|
||||
p.fillRect(rect(), palette().base());
|
||||
QPainter p(this);
|
||||
p.fillRect(rect(), palette().base());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -25,56 +25,55 @@
|
||||
|
||||
#include "common/define.h"
|
||||
|
||||
namespace olive {
|
||||
|
||||
class TrackViewSplitterHandle : public QSplitterHandle
|
||||
namespace olive
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
class TrackViewSplitterHandle : public QSplitterHandle {
|
||||
Q_OBJECT
|
||||
public:
|
||||
TrackViewSplitterHandle(Qt::Orientation orientation, QSplitter *parent);
|
||||
TrackViewSplitterHandle(Qt::Orientation orientation, QSplitter *parent);
|
||||
|
||||
protected:
|
||||
virtual void mousePressEvent(QMouseEvent *e) override;
|
||||
virtual void mouseMoveEvent(QMouseEvent *e) override;
|
||||
virtual void mouseReleaseEvent(QMouseEvent *e) override;
|
||||
virtual void mousePressEvent(QMouseEvent *e) override;
|
||||
virtual void mouseMoveEvent(QMouseEvent *e) override;
|
||||
virtual void mouseReleaseEvent(QMouseEvent *e) override;
|
||||
|
||||
virtual void paintEvent(QPaintEvent *e) override;
|
||||
virtual void paintEvent(QPaintEvent *e) override;
|
||||
|
||||
private:
|
||||
int drag_y_;
|
||||
int drag_y_;
|
||||
|
||||
bool dragging_;
|
||||
bool dragging_;
|
||||
};
|
||||
|
||||
class TrackViewSplitter : public QSplitter
|
||||
{
|
||||
Q_OBJECT
|
||||
class TrackViewSplitter : public QSplitter {
|
||||
Q_OBJECT
|
||||
public:
|
||||
TrackViewSplitter(Qt::Alignment vertical_alignment, QWidget* parent = nullptr);
|
||||
TrackViewSplitter(Qt::Alignment vertical_alignment,
|
||||
QWidget *parent = nullptr);
|
||||
|
||||
void HandleReceiver(TrackViewSplitterHandle* h, int diff);
|
||||
void HandleReceiver(TrackViewSplitterHandle *h, int diff);
|
||||
|
||||
void SetHeightWithSizes(QList<int> sizes);
|
||||
void SetHeightWithSizes(QList<int> sizes);
|
||||
|
||||
void Insert(int index, int height, QWidget* item);
|
||||
void Remove(int index);
|
||||
void Insert(int index, int height, QWidget *item);
|
||||
void Remove(int index);
|
||||
|
||||
void SetSpacerHeight(int height);
|
||||
void SetSpacerHeight(int height);
|
||||
|
||||
public slots:
|
||||
void SetTrackHeight(int index, int h);
|
||||
void SetTrackHeight(int index, int h);
|
||||
|
||||
signals:
|
||||
void TrackHeightChanged(int index, int height);
|
||||
void TrackHeightChanged(int index, int height);
|
||||
|
||||
protected:
|
||||
virtual QSplitterHandle *createHandle() override;
|
||||
virtual QSplitterHandle *createHandle() override;
|
||||
|
||||
private:
|
||||
Qt::Alignment alignment_;
|
||||
|
||||
int spacer_height_;
|
||||
Qt::Alignment alignment_;
|
||||
|
||||
int spacer_height_;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user