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

Restore advanced Xsheet/Timeline Flip button and Frame numbering

Browse source
This commit is contained in:
manongjohn 2022-12-19 21:52:09 -05:00
parent 9674e7d746
commit 1bca51b74e
2 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -462,7 +462,7 @@ NoteArea::NoteArea(XsheetViewer *parent, Qt::WFlags flags)
#endif #endif
: QFrame(parent) : QFrame(parent)
, m_viewer(parent) , m_viewer(parent)
// , m_flipOrientationButton(nullptr) , m_flipOrientationButton(nullptr)
, m_noteButton(nullptr) , m_noteButton(nullptr)
, m_precNoteButton(nullptr) , m_precNoteButton(nullptr)
, m_nextNoteButton(nullptr) , m_nextNoteButton(nullptr)
@ -475,7 +475,7 @@ NoteArea::NoteArea(XsheetViewer *parent, Qt::WFlags flags)
setFrameStyle(QFrame::StyledPanel); setFrameStyle(QFrame::StyledPanel);
setObjectName("cornerWidget"); setObjectName("cornerWidget");
// m_flipOrientationButton = new QPushButton(this); m_flipOrientationButton = new QPushButton(this);
m_noteButton = new QToolButton(this); m_noteButton = new QToolButton(this);
m_precNoteButton = new QToolButton(this); m_precNoteButton = new QToolButton(this);
m_nextNoteButton = new QToolButton(this); m_nextNoteButton = new QToolButton(this);
@ -484,13 +484,13 @@ NoteArea::NoteArea(XsheetViewer *parent, Qt::WFlags flags)
m_layerHeaderPanel = new LayerHeaderPanel(m_viewer, this); m_layerHeaderPanel = new LayerHeaderPanel(m_viewer, this);
//----- //-----
//
// m_flipOrientationButton->setObjectName("flipOrientationButton"); m_flipOrientationButton->setObjectName("flipOrientationButton");
// m_flipOrientationButton->setFocusPolicy(Qt::FocusPolicy::NoFocus); m_flipOrientationButton->setFocusPolicy(Qt::FocusPolicy::NoFocus);
// m_flipOrientationButton->setFixedSize(QSize(70, 23)); m_flipOrientationButton->setFixedSize(QSize(70, 23));
// m_flipOrientationButton->setIconSize(QSize(20, 20)); m_flipOrientationButton->setIconSize(QSize(20, 20));
// m_flipOrientationButton->setIcon(createQIcon("toggle_xsheet_orientation")); m_flipOrientationButton->setIcon(createQIcon("toggle_xsheet_orientation"));
// m_flipOrientationButton->setToolTip(tr("Toggle Xsheet/Timeline")); m_flipOrientationButton->setToolTip(tr("Toggle Xsheet/Timeline"));
m_newLevelButton->setObjectName("ToolbarToolButton"); m_newLevelButton->setObjectName("ToolbarToolButton");
m_newLevelButton->setFixedSize(34, 25); m_newLevelButton->setFixedSize(34, 25);
@ -527,14 +527,18 @@ NoteArea::NoteArea(XsheetViewer *parent, Qt::WFlags flags)
m_frameDisplayStyleCombo->addItems(frameDisplayStyles); m_frameDisplayStyleCombo->addItems(frameDisplayStyles);
m_frameDisplayStyleCombo->setCurrentIndex( m_frameDisplayStyleCombo->setCurrentIndex(
(int)m_viewer->getFrameDisplayStyle()); (int)m_viewer->getFrameDisplayStyle());
m_frameDisplayStyleCombo->hide();
if (!Preferences::instance()->isShowAdvancedOptionsEnabled()) {
m_flipOrientationButton->hide();
m_frameDisplayStyleCombo->hide();
}
createLayout(); createLayout();
// signal-slot connections // signal-slot connections
bool ret = true; bool ret = true;
// ret = ret && connect(m_flipOrientationButton, SIGNAL(clicked()), ret = ret && connect(m_flipOrientationButton, SIGNAL(clicked()),
// SLOT(flipOrientation())); SLOT(flipOrientation()));
ret = ret && connect(m_noteButton, SIGNAL(clicked()), SLOT(toggleNewNote())); ret = ret && connect(m_noteButton, SIGNAL(clicked()), SLOT(toggleNewNote()));
ret = ret && ret = ret &&
@ -563,7 +567,7 @@ NoteArea::NoteArea(XsheetViewer *parent, Qt::WFlags flags)
void NoteArea::removeLayout() { void NoteArea::removeLayout() {
if (!m_currentLayout) return; if (!m_currentLayout) return;
// m_currentLayout->removeWidget(m_flipOrientationButton); m_currentLayout->removeWidget(m_flipOrientationButton);
m_currentLayout->removeWidget(m_noteButton); m_currentLayout->removeWidget(m_noteButton);
m_currentLayout->removeWidget(m_precNoteButton); m_currentLayout->removeWidget(m_precNoteButton);
m_currentLayout->removeWidget(m_nextNoteButton); m_currentLayout->removeWidget(m_nextNoteButton);
@ -624,6 +628,8 @@ void NoteArea::createLayout() {
mainLayout->setMargin(1); mainLayout->setMargin(1);
mainLayout->setSpacing(0); mainLayout->setSpacing(0);
{ {
mainLayout->addWidget(m_flipOrientationButton, 0, centerAlign);
mainLayout->addStretch(1); mainLayout->addStretch(1);
mainLayout->addWidget(m_newLevelButton, 0, centerAlign); mainLayout->addWidget(m_newLevelButton, 0, centerAlign);
@ -681,13 +687,13 @@ void NoteArea::updateButtons() {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// void NoteArea::flipOrientation() { m_viewer->flipOrientation(); } void NoteArea::flipOrientation() { m_viewer->flipOrientation(); }
void NoteArea::onXsheetOrientationChanged(const Orientation *newOrientation) { void NoteArea::onXsheetOrientationChanged(const Orientation *newOrientation) {
// m_flipOrientationButton->setText(newOrientation->caption()); // m_flipOrientationButton->setText(newOrientation->caption());
// m_flipOrientationButton->setIcon(createQIcon("toggle_xsheet_orientation")); m_flipOrientationButton->setIcon(createQIcon("toggle_xsheet_orientation"));
// m_flipOrientationButton->setIconSize(QSize(20, 20)); m_flipOrientationButton->setIconSize(QSize(20, 20));
removeLayout(); removeLayout();
createLayout(); createLayout();

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

@ -121,7 +121,7 @@ class NoteArea final : public QFrame {
XsheetViewer *m_viewer; XsheetViewer *m_viewer;
// QPushButton *m_flipOrientationButton; QPushButton *m_flipOrientationButton;
QToolButton *m_noteButton; QToolButton *m_noteButton;
QToolButton *m_nextNoteButton; QToolButton *m_nextNoteButton;
@ -146,7 +146,7 @@ public:
void updateButtons(); void updateButtons();
protected slots: protected slots:
// void flipOrientation(); void flipOrientation();
void toggleNewNote(); void toggleNewNote();
void nextNote(); void nextNote();
void precNote(); void precNote();