razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Remove auto-creation buttons from timeline/xsheet

Browse source
This commit is contained in:
manongjohn 2021-06-03 00:17:17 -04:00
parent 09d2f8bd89
commit c79faf4f75
6 changed files with 2 additions and 191 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
toonz/sources/include/orientation.h
View file

@ -137,13 +137,7 @@ enum class PredefinedRect {
// ADD_LEVEL_AREA,
// ADD_LEVEL,
FOOTER_NOTE_OBJ_AREA,
FOOTER_NOTE_AREA,
AUTO_CREATE_AREA,
AUTO_CREATE,
CREATE_IN_HOLD_AREA,
CREATE_IN_HOLD,
AUTO_STRETCH_AREA,
AUTO_STRETCH
FOOTER_NOTE_AREA
};
enum class PredefinedLine {
LOCKED, //! dotted vertical line when cell is locked

66
toonz/sources/toonz/layerfooterpanel.cpp
View file

@ -16,8 +16,6 @@
#include "toonzqt/gutil.h"
#include <QToolButton>
using XsheetGUI::ColumnArea;
LayerFooterPanel::LayerFooterPanel(XsheetViewer *viewer, QWidget *parent,
@ -39,54 +37,8 @@ LayerFooterPanel::LayerFooterPanel(XsheetViewer *viewer, QWidget *parent,
m_frameZoomSlider->setValue(m_viewer->getFrameZoomFactor());
m_frameZoomSlider->setToolTip(tr("Zoom in/out of timeline"));
m_autoCreateButton = new QToolButton(this);
m_createInHoldButton = new QToolButton(this);
m_autoStretchButton = new QToolButton(this);
m_autoCreateButton->setObjectName("ToolbarToolButton");
m_autoCreateButton->setFixedSize(o->rect(PredefinedRect::AUTO_CREATE).size());
m_autoCreateButton->setIconSize(QSize(15, 15));
m_autoCreateButton->setIcon(createQIcon("auto_create"));
m_autoCreateButton->setToolTip(
tr("Toggles the auto-creation of frames when drawing in blank cells on "
"the timeline/xsheet."));
m_autoCreateButton->setCheckable(true);
m_createInHoldButton->setObjectName("ToolbarToolButton");
m_createInHoldButton->setFixedSize(
o->rect(PredefinedRect::CREATE_IN_HOLD).size());
m_createInHoldButton->setIconSize(QSize(15, 15));
m_createInHoldButton->setIcon(createQIcon("create_in_hold"));
m_createInHoldButton->setToolTip(
tr("Toggles the auto-creation of frames when drawing in held cells on "
"the timeline/xsheet."));
m_createInHoldButton->setCheckable(true);
m_autoStretchButton->setObjectName("ToolbarToolButton");
m_autoStretchButton->setFixedSize(
o->rect(PredefinedRect::AUTO_STRETCH).size());
m_autoStretchButton->setIconSize(QSize(15, 15));
m_autoStretchButton->setIcon(createQIcon("auto_stretch"));
m_autoStretchButton->setToolTip(
tr("Toggles the auto-stretch of a frame to the next frame."));
m_autoStretchButton->setCheckable(true);
connect(m_frameZoomSlider, SIGNAL(valueChanged(int)), this,
SLOT(onFrameZoomSliderValueChanged(int)));
connect(m_autoCreateButton, &QToolButton::clicked, [=]() {
CommandManager::instance()->getAction("MI_ToggleAutoCreate")->trigger();
});
connect(m_createInHoldButton, &QToolButton::clicked, [=]() {
CommandManager::instance()
->getAction("MI_ToggleCreationInHoldCells")
->trigger();
});
connect(m_autoStretchButton, &QToolButton::clicked, [=]() {
CommandManager::instance()->getAction("MI_ToggleAutoStretch")->trigger();
});
}
LayerFooterPanel::~LayerFooterPanel() {}
@ -148,22 +100,6 @@ void LayerFooterPanel::paintEvent(QPaintEvent *event) {
// svgToPixmap(":Resources/new_level_rollover.svg");
// const QRect addLevelImgRect = o->rect(PredefinedRect::ADD_LEVEL);
m_autoCreateButton->setGeometry(o->rect(PredefinedRect::AUTO_CREATE));
m_autoCreateButton->setChecked(CommandManager::instance()
->getAction("MI_ToggleAutoCreate")
->isChecked());
m_createInHoldButton->setGeometry(o->rect(PredefinedRect::CREATE_IN_HOLD));
m_createInHoldButton->setChecked(
CommandManager::instance()
->getAction("MI_ToggleCreationInHoldCells")
->isChecked());
m_autoStretchButton->setGeometry(o->rect(PredefinedRect::AUTO_STRETCH));
m_autoStretchButton->setChecked(CommandManager::instance()
->getAction("MI_ToggleAutoStretch")
->isChecked());
p.setRenderHint(QPainter::SmoothPixmapTransform, true);
if (m_zoomInHighlighted)
p.drawPixmap(zoomInImgRect, zoomInRollover);
@ -184,8 +120,6 @@ void LayerFooterPanel::paintEvent(QPaintEvent *event) {
QLine line = {leftSide(shorter(zoomOutImgRect)).translated(-4, 0)};
p.drawLine(line);
QLine line2 = {leftSide(shorter(noteObjRect)).translated(-4, 0)};
p.drawLine(line2);
}
void LayerFooterPanel::showOrHide(const Orientation *o) {

1
toonz/sources/toonz/layerfooterpanel.h
View file

@ -28,7 +28,6 @@ class LayerFooterPanel final : public QWidget {
bool m_zoomInHighlighted = false;
bool m_zoomOutHighlighted = false;
// bool m_addLevelHighlighted = false;
QToolButton *m_autoCreateButton, *m_createInHoldButton, *m_autoStretchButton;
private:
XsheetViewer *m_viewer;

82
toonz/sources/toonz/xshnoteviewer.cpp
View file

@ -459,12 +459,8 @@ NoteArea::NoteArea(XsheetViewer *parent, Qt::WFlags flags)
, m_noteButton(nullptr)
, m_precNoteButton(nullptr)
, m_nextNoteButton(nullptr)
, m_autoCreateButton(nullptr)
, m_createInHoldButton(nullptr)
, m_autoStretchButton(nullptr)
, m_frameDisplayStyleCombo(nullptr)
, m_layerHeaderPanel(nullptr) {
const Orientation *o = m_viewer->orientation();
setFrameStyle(QFrame::StyledPanel);
setObjectName("cornerWidget");
@ -474,9 +470,6 @@ NoteArea::NoteArea(XsheetViewer *parent, Qt::WFlags flags)
m_precNoteButton = new QToolButton(this);
m_nextNoteButton = new QToolButton(this);
m_newLevelButton = new QToolButton(this);
m_autoCreateButton = new QToolButton(this);
m_createInHoldButton = new QToolButton(this);
m_autoStretchButton = new QToolButton(this);
m_frameDisplayStyleCombo = new QComboBox(this);
m_layerHeaderPanel = new LayerHeaderPanel(m_viewer, this);
@ -518,34 +511,6 @@ NoteArea::NoteArea(XsheetViewer *parent, Qt::WFlags flags)
m_nextNoteButton->setIcon(createQIcon("nextkey"));
m_nextNoteButton->setToolTip(tr("Next Memo"));
m_autoCreateButton->setObjectName("ToolbarToolButton");
m_autoCreateButton->setFixedSize(o->rect(PredefinedRect::AUTO_CREATE).size());
m_autoCreateButton->setIconSize(QSize(16, 16));
m_autoCreateButton->setIcon(createQIcon("auto_create"));
m_autoCreateButton->setToolTip(
tr("Toggles the auto-creation of frames when drawing in blank cells on "
"the timeline/xsheet."));
m_autoCreateButton->setCheckable(true);
m_createInHoldButton->setObjectName("ToolbarToolButton");
m_createInHoldButton->setFixedSize(
o->rect(PredefinedRect::CREATE_IN_HOLD).size());
m_createInHoldButton->setIconSize(QSize(16, 16));
m_createInHoldButton->setIcon(createQIcon("create_in_hold"));
m_createInHoldButton->setToolTip(
tr("Toggles the auto-creation of frames when drawing in held cells on "
"the timeline/xsheet."));
m_createInHoldButton->setCheckable(true);
m_autoStretchButton->setObjectName("ToolbarToolButton");
m_autoStretchButton->setFixedSize(
o->rect(PredefinedRect::AUTO_STRETCH).size());
m_autoStretchButton->setIconSize(QSize(16, 16));
m_autoStretchButton->setIcon(createQIcon("auto_stretch"));
m_autoStretchButton->setToolTip(
tr("Toggles the auto-stretch of a frame to the next frame."));
m_autoStretchButton->setCheckable(true);
QStringList frameDisplayStyles;
frameDisplayStyles << tr("Frame") << tr("Sec Frame") << tr("6sec Sheet")
<< tr("3sec Sheet");
@ -571,21 +536,6 @@ NoteArea::NoteArea(XsheetViewer *parent, Qt::WFlags flags)
CommandManager::instance()->execute("MI_NewLevel");
});
ret =
ret && connect(m_autoCreateButton, &QToolButton::clicked, [=]() {
CommandManager::instance()->getAction("MI_ToggleAutoCreate")->trigger();
});
ret = ret && connect(m_createInHoldButton, &QToolButton::clicked, [=]() {
CommandManager::instance()
->getAction("MI_ToggleCreationInHoldCells")
->trigger();
});
ret = ret && connect(m_autoStretchButton, &QToolButton::clicked, [=]() {
CommandManager::instance()
->getAction("MI_ToggleAutoStretch")
->trigger();
});
ret =
ret && connect(m_frameDisplayStyleCombo, SIGNAL(currentIndexChanged(int)),
this, SLOT(onFrameDisplayStyleChanged(int)));
@ -609,9 +559,6 @@ void NoteArea::removeLayout() {
currentLayout->removeWidget(m_precNoteButton);
currentLayout->removeWidget(m_nextNoteButton);
currentLayout->removeWidget(m_newLevelButton);
currentLayout->removeWidget(m_autoCreateButton);
currentLayout->removeWidget(m_createInHoldButton);
currentLayout->removeWidget(m_autoStretchButton);
currentLayout->removeWidget(m_frameDisplayStyleCombo);
currentLayout->removeWidget(m_layerHeaderPanel);
delete currentLayout;
@ -641,16 +588,6 @@ void NoteArea::createLayout() {
mainLayout->addStretch(1);
QHBoxLayout *AutoCreatebuttonsLayout = new QHBoxLayout();
AutoCreatebuttonsLayout->setMargin(0);
AutoCreatebuttonsLayout->setSpacing(0);
{
AutoCreatebuttonsLayout->addWidget(m_autoCreateButton, 0);
AutoCreatebuttonsLayout->addWidget(m_createInHoldButton, 0);
AutoCreatebuttonsLayout->addWidget(m_autoStretchButton, 0);
}
mainLayout->addLayout(AutoCreatebuttonsLayout, 0);
QHBoxLayout *buttonsLayout = new QHBoxLayout();
buttonsLayout->setMargin(0);
buttonsLayout->setSpacing(0);
@ -674,16 +611,10 @@ void NoteArea::createLayout() {
m_precNoteButton->hide();
m_nextNoteButton->hide();
m_noteButton->hide();
m_autoCreateButton->hide();
m_createInHoldButton->hide();
m_autoStretchButton->hide();
} else {
m_precNoteButton->show();
m_nextNoteButton->show();
m_noteButton->show();
m_autoCreateButton->show();
m_createInHoldButton->show();
m_autoStretchButton->show();
}
}
@ -705,19 +636,6 @@ void NoteArea::updateButtons() {
}
}
void NoteArea::paintEvent(QPaintEvent *event) {
m_autoCreateButton->setChecked(CommandManager::instance()
->getAction("MI_ToggleAutoCreate")
->isChecked());
m_createInHoldButton->setChecked(
CommandManager::instance()
->getAction("MI_ToggleCreationInHoldCells")
->isChecked());
m_autoStretchButton->setChecked(CommandManager::instance()
->getAction("MI_ToggleAutoStretch")
->isChecked());
}
//-----------------------------------------------------------------------------
// void NoteArea::flipOrientation() { m_viewer->flipOrientation(); }

5
toonz/sources/toonz/xshnoteviewer.h
View file

@ -126,9 +126,6 @@ class NoteArea final : public QFrame {
QToolButton *m_nextNoteButton;
QToolButton *m_precNoteButton;
QToolButton *m_newLevelButton;
QToolButton *m_autoCreateButton;
QToolButton *m_createInHoldButton;
QToolButton *m_autoStretchButton;
QComboBox *m_frameDisplayStyleCombo;
@ -154,8 +151,6 @@ protected slots:
void onXsheetOrientationChanged(const Orientation *orientation);
protected:
void paintEvent(QPaintEvent *event) override;
void removeLayout();
void createLayout();
};

31
toonz/sources/toonzlib/orientation.cpp
View file

@ -338,20 +338,6 @@ TopToBottomOrientation::TopToBottomOrientation() {
addRect(PredefinedRect::NOTE_ICON,
QRect(QPoint(0, 0), QSize(CELL_WIDTH - 2, CELL_HEIGHT - 2)));
QRect autoCreate, createInHold, autoStretch;
autoCreate = QRect(0, 0, 17, 17);
addRect(PredefinedRect::AUTO_CREATE_AREA, autoCreate);
addRect(PredefinedRect::AUTO_CREATE, autoCreate.adjusted(1, 1, 0, 0));
createInHold = QRect(0, 0, 17, 17);
addRect(PredefinedRect::CREATE_IN_HOLD_AREA, createInHold);
addRect(PredefinedRect::CREATE_IN_HOLD, createInHold.adjusted(1, 1, 0, 0));
autoStretch = QRect(0, 0, 17, 17);
addRect(PredefinedRect::AUTO_STRETCH_AREA, autoStretch);
addRect(PredefinedRect::AUTO_STRETCH, autoStretch.adjusted(1, 1, 0, 0));
// Layer header panel
addRect(PredefinedRect::LAYER_HEADER_PANEL, QRect(0, 0, -1, -1)); // hide
addRect(PredefinedRect::PANEL_EYE, QRect(0, 0, -1, -1)); // hide
@ -1129,22 +1115,7 @@ LeftToRightOrientation::LeftToRightOrientation() {
QRect(0, 0, LAYER_HEADER_WIDTH + 2, LAYER_FOOTER_PANEL_HEIGHT));
addRect(PredefinedRect::LAYER_FOOTER_PANEL, layerFooterPanel);
QRect zoomSlider, zoomIn, zoomOut, noteArea, autoCreate, createInHold,
autoStretch; // addLevel,
autoCreate = QRect(1, 0, 16, LAYER_FOOTER_PANEL_HEIGHT);
addRect(PredefinedRect::AUTO_CREATE_AREA, autoCreate);
addRect(PredefinedRect::AUTO_CREATE, autoCreate.adjusted(1, 1, 0, 0));
createInHold =
QRect(autoCreate.right() + 1, 0, 16, LAYER_FOOTER_PANEL_HEIGHT);
addRect(PredefinedRect::CREATE_IN_HOLD_AREA, createInHold);
addRect(PredefinedRect::CREATE_IN_HOLD, createInHold.adjusted(1, 1, 0, 0));
autoStretch =
QRect(createInHold.right() + 1, 0, 16, LAYER_FOOTER_PANEL_HEIGHT);
addRect(PredefinedRect::AUTO_STRETCH_AREA, autoStretch);
addRect(PredefinedRect::AUTO_STRETCH, autoStretch.adjusted(1, 1, 0, 0));
QRect zoomSlider, zoomIn, zoomOut, noteArea; // addLevel,
zoomSlider =
QRect(layerFooterPanel.width() - 100, 0, 81, LAYER_FOOTER_PANEL_HEIGHT);