OpenToonz - An open-source full-featured 2D animation creation software
C
Added: menu to hide toolbar buttons, Name Editor button and missing icons
justburnerebb16a7facbe
diff --git a/toonz/sources/include/toonzqt/paletteviewer.h b/toonz/sources/include/toonzqt/paletteviewer.hindex 3f763c44d..261010939 100644--- a/toonz/sources/include/toonzqt/paletteviewer.h+++ b/toonz/sources/include/toonzqt/paletteviewer.h@@ -54,7 +54,16 @@ public:bool hasPasteColors = true);~PaletteViewer();- const TPaletteHandle *getPaletteHandle() const { return m_paletteHandle; }+ enum ToolbarButtons : int //! Toolbar buttons to display+ {+ TBVisKeyframe,+ TBVisNewStylePage,+ TBVisPaletteGizmo,+ TBVisNameEditor,+ TBVisTotal+ };++ TPaletteHandle *getPaletteHandle() const { return m_paletteHandle; }void setPaletteHandle(TPaletteHandle *paletteHandle);const TFrameHandle *getFrameHandle() const { return m_frameHandle; }@@ -121,6 +130,16 @@ protected:DvScrollWidget *m_toolbarContainer;QHBoxLayout *m_hLayout;+ StyleNameEditor *m_styleNameEditor;+ QAction *m_sharedGizmoAction;++ int m_toolbarVisibleOtherParts;+ QMultiMap<int, QAction *> m_toolbarParts;+ QAction *m_visibleKeysAction;+ QAction *m_visibleNewAction;+ QAction *m_visibleGizmoAction;+ QAction *m_visibleNameAction;+protected:void createTabBar();@@ -152,6 +171,8 @@ protected:void clearStyleSelection();+ void applyToolbarPartVisibility(int part, bool visible);+protected slots:void setPageView(int currentIndexPage);@@ -182,6 +203,11 @@ protected slots:void onShowNewStyleButtonToggled();void toggleToolbarOnTop();++ void toggleKeyframeVisibility(bool);+ void toggleNewStylePageVisibility(bool);+ void togglePaletteGizmoVisibility(bool);+ void toggleNameEditorVisibility(bool);};#endif // PALETTEVIEWER_Hdiff --git a/toonz/sources/toonz/icons/dark/actions/16/new_page.svg b/toonz/sources/toonz/icons/dark/actions/16/new_page.svgnew file mode 100644index 000000000..671ee84e8--- /dev/null+++ b/toonz/sources/toonz/icons/dark/actions/16/new_page.svg@@ -0,0 +1,11 @@+<?xml version="1.0" encoding="UTF-8"?>+<svg width="16" height="16" clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" version="1.1" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">+ <rect width="20" height="20" fill-opacity="0"/>+ <g transform="translate(-2,-2)">++ <path d="m4.5 16c-0.398 0-0.779-0.158-1.061-0.439-0.281-0.282-0.439-0.663-0.439-1.061v-9c0-0.828 0.672-1.5 1.5-1.5h3c0.828 0 1.5 0.672 1.5 1.5v1.5h6.5c0.828 0 1.5 0.672 1.5 1.5v6c0 0.398-0.158 0.779-0.439 1.061-0.282 0.281-0.663 0.439-1.061 0.439zm3.5-8v-2.5c0-0.276-0.224-0.5-0.5-0.5h-3c-0.276 0-0.5 0.224-0.5 0.5v9c0 0.133 0.053 0.26 0.146 0.354 0.094 0.093 0.221 0.146 0.354 0.146h11c0.276 0 0.5-0.224 0.5-0.5v-6c0-0.276-0.224-0.5-0.5-0.5z"/>++ </g>+ <rect x="10" y="2.5" width="1" height="3"/>+ <path d="m 13.5,2 c 0.398,0 0.779,0.158 1.061,0.439 C 14.842,2.721 15,3.102 15,3.5 V 7 H 14 V 3.5 C 14,3.367 13.947,3.24 13.854,3.146 13.76,3.053 13.633,3 13.5,3 H 5 V 2 Z"/>+</svg>diff --git a/toonz/sources/toonz/icons/dark/actions/16/new_style.svg b/toonz/sources/toonz/icons/dark/actions/16/new_style.svgnew file mode 100644index 000000000..b86484c45--- /dev/null+++ b/toonz/sources/toonz/icons/dark/actions/16/new_style.svg@@ -0,0 +1,9 @@+<?xml version="1.0" encoding="UTF-8"?>+<svg width="16" height="16" clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" version="1.1" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">+ <rect width="20" height="20" fill-opacity="0"/>+ <g transform="translate(-2,-2)">++ <path d="m7.421 16c-0.269 0-0.528-0.107-0.719-0.298l-3.41-3.41c-0.187-0.187-0.292-0.44-0.292-0.705v-6.087c0-0.828 0.672-1.5 1.5-1.5h11c0.828 0 1.5 0.672 1.5 1.5v9c0 0.398-0.158 0.779-0.439 1.061-0.282 0.281-0.663 0.439-1.061 0.439zm8.579-10.5c0-0.276-0.224-0.5-0.5-0.5h-11c-0.276 0-0.5 0.224-0.5 0.5v5.5h2.972c0.568 0 1.028 0.46 1.028 1.028v2.972h7.5c0.276 0 0.5-0.224 0.5-0.5z"/>++ </g>+</svg>diff --git a/toonz/sources/toonz/toonz.qrc b/toonz/sources/toonz/toonz.qrcindex 9832d7cb8..18daa3a86 100644--- a/toonz/sources/toonz/toonz.qrc+++ b/toonz/sources/toonz/toonz.qrc@@ -448,6 +448,8 @@<file>icons/dark/actions/16/palette_tab.svg</file><file>icons/dark/actions/20/dragpalette.svg</file><file>icons/dark/actions/16/palettegizmo.svg</file>+ <file>icons/dark/actions/16/new_style.svg</file>+ <file>icons/dark/actions/16/new_page.svg</file><!-- Titlebars --><file>icons/dark/actions/20/pane_table.svg</file>diff --git a/toonz/sources/toonzqt/paletteviewer.cpp b/toonz/sources/toonzqt/paletteviewer.cppindex 9996acaf1..4bc874ae4 100644--- a/toonz/sources/toonzqt/paletteviewer.cpp+++ b/toonz/sources/toonzqt/paletteviewer.cpp@@ -10,6 +10,7 @@#include "toonzqt/dvscrollwidget.h"#include "toonzqt/studiopaletteviewer.h"#include "toonzqt/styleselection.h"+#include "toonzqt/stylenameeditor.h"#include "palettedata.h"// TnzLib includes@@ -121,6 +122,7 @@ PaletteViewer::PaletteViewer(QWidget *parent, PaletteViewType viewType,, m_toolbarOnTop(false), m_showToolbarOnTopAct(nullptr), m_toolbarContainer(0)+ , m_styleNameEditor(nullptr), m_hLayout(0) {setObjectName("OnePixelMarginFrame");setFrameStyle(QFrame::StyledPanel);@@ -231,15 +233,67 @@ void PaletteViewer::toggleToolbarOnTop() {//-----------------------------------------------------------------------------+void PaletteViewer::applyToolbarPartVisibility(int part, bool visible) {+ assert(m_toolbarParts.contains(part));+ for (QAction *action : m_toolbarParts.values(part)) {+ action->setVisible(visible);+ }+}++//-----------------------------------------------------------------------------++void PaletteViewer::toggleKeyframeVisibility(bool checked) {+ applyToolbarPartVisibility(TBVisKeyframe, checked);+}++void PaletteViewer::toggleNewStylePageVisibility(bool checked) {+ applyToolbarPartVisibility(TBVisNewStylePage, checked);+}++void PaletteViewer::togglePaletteGizmoVisibility(bool checked) {+ applyToolbarPartVisibility(TBVisPaletteGizmo, checked);+}++void PaletteViewer::toggleNameEditorVisibility(bool checked) {+ applyToolbarPartVisibility(TBVisNameEditor, checked);+}++//-----------------------------------------------------------------------------+void PaletteViewer::save(QSettings &settings) const {int toolbarOnTop = m_toolbarOnTop ? 1 : 0;settings.setValue("toolbarOnTop", toolbarOnTop);+ int visibleParts = m_toolbarVisibleOtherParts;+ if (m_visibleKeysAction->isChecked()) visibleParts |= 0x01;+ if (m_visibleNewAction->isChecked()) visibleParts |= 0x02;+ if (m_visibleGizmoAction->isChecked()) visibleParts |= 0x04;+ if (m_visibleNameAction->isChecked()) visibleParts |= 0x08;+ settings.setValue("toolbarVisibleMsk", visibleParts);}void PaletteViewer::load(QSettings &settings) {bool toolbarOnTop =settings.value("toolbarOnTop", m_toolbarOnTop).toInt() != 0;if (toolbarOnTop != m_toolbarOnTop) toggleToolbarOnTop();++ int visibleParts;+ QVariant visibleVar = settings.value("toolbarVisibleMsk");+ if (visibleVar.canConvert(QVariant::Int)) {+ visibleParts = visibleVar.toInt();+ } else {+ visibleParts = 3; // Show keyframes and new style/page+ }++ m_visibleKeysAction->setChecked(visibleParts & 0x01);+ m_visibleNewAction->setChecked(visibleParts & 0x02);+ m_visibleGizmoAction->setChecked(visibleParts & 0x04);+ m_visibleNameAction->setChecked(visibleParts & 0x08);+ m_toolbarVisibleOtherParts = visibleParts & ~0x0F; // Reserve++ applyToolbarPartVisibility(TBVisKeyframe, visibleParts & 0x01);+ applyToolbarPartVisibility(TBVisNewStylePage, visibleParts & 0x02);+ applyToolbarPartVisibility(TBVisPaletteGizmo, visibleParts & 0x04);+ applyToolbarPartVisibility(TBVisNameEditor, visibleParts & 0x08);}//-----------------------------------------------------------------------------@@ -454,6 +508,44 @@ void PaletteViewer::createPaletteToolBar() {viewMode->addSeparator();+ // Add ability to show or hide buttons+ QMenu *visibleButtons = new QMenu(tr("Visible Toolbar Buttons"));++ m_visibleKeysAction = new QAction(tr("KeyFrame"));+ m_visibleKeysAction->setCheckable(true);+ m_visibleKeysAction->setChecked(true);+ visibleButtons->addAction(m_visibleKeysAction);+ m_visibleNewAction = new QAction(tr("New Style/Page"));+ m_visibleNewAction->setCheckable(true);+ m_visibleNewAction->setChecked(true);+ visibleButtons->addAction(m_visibleNewAction);+ m_visibleGizmoAction = new QAction(tr("Palette Gizmo"));+ m_visibleGizmoAction->setCheckable(true);+ m_visibleGizmoAction->setChecked(true);+ visibleButtons->addAction(m_visibleGizmoAction);+ m_visibleNameAction = new QAction(tr("Name Editor"));+ m_visibleNameAction->setCheckable(true);+ m_visibleNameAction->setChecked(true);+ visibleButtons->addAction(m_visibleNameAction);+ viewMode->addMenu(visibleButtons);++ if (m_viewType == CLEANUP_PALETTE)+ m_visibleKeysAction->setVisible(false);++ if (m_viewType != LEVEL_PALETTE)+ m_visibleGizmoAction->setVisible(false);++ connect(m_visibleKeysAction, SIGNAL(toggled(bool)), this,+ SLOT(toggleKeyframeVisibility(bool)));+ connect(m_visibleNewAction, SIGNAL(toggled(bool)), this,+ SLOT(toggleNewStylePageVisibility(bool)));+ connect(m_visibleGizmoAction, SIGNAL(toggled(bool)), this,+ SLOT(togglePaletteGizmoVisibility(bool)));+ connect(m_visibleNameAction, SIGNAL(toggled(bool)), this,+ SLOT(toggleNameEditorVisibility(bool)));++ viewMode->addMenu(visibleButtons);+m_showToolbarOnTopAct = new QAction;if (m_toolbarOnTop)m_showToolbarOnTopAct->setText(tr("Set Toolbar Below Styles"));@@ -477,11 +569,35 @@ void PaletteViewer::createPaletteToolBar() {m_paletteToolBar->addWidget(viewModeButton);m_paletteToolBar->addSeparator();+ m_toolbarParts.clear();++ QAction *openStyleNameEditorAct = new QAction(tr("Name Editor"));+ openStyleNameEditorAct->setIcon(createQIcon("rename", false, true));+ connect(openStyleNameEditorAct, &QAction::triggered, [&]() {+ if (!m_styleNameEditor) {+ m_styleNameEditor = new StyleNameEditor(this);+ m_styleNameEditor->setPaletteHandle(getPaletteHandle());+ }+ m_styleNameEditor->show();+ m_styleNameEditor->raise();+ m_styleNameEditor->activateWindow();+ });+ m_paletteToolBar->addAction(openStyleNameEditorAct);+ m_toolbarParts.insert(TBVisNameEditor, openStyleNameEditorAct);+ m_toolbarParts.insert(TBVisNameEditor, m_paletteToolBar->addSeparator());+if (m_viewType == LEVEL_PALETTE) {CommandManager *cmd = CommandManager::instance();- QAction *gizmo = cmd->getAction("MI_OpenPltGizmo");- m_paletteToolBar->addAction(gizmo);- m_paletteToolBar->addSeparator();+ m_sharedGizmoAction = cmd->getAction("MI_OpenPltGizmo");++ // Clone palette gizmo action so visibility can be control+ QAction *palGizmo = new DVAction(m_sharedGizmoAction->icon(),+ m_sharedGizmoAction->text(), this);+ connect(palGizmo, &QAction::triggered,+ [&]() { m_sharedGizmoAction->trigger(); });+ m_paletteToolBar->addAction(palGizmo);+ m_toolbarParts.insert(TBVisPaletteGizmo, palGizmo);+ m_toolbarParts.insert(TBVisPaletteGizmo, m_paletteToolBar->addSeparator());}if (m_hasPageCommand) {@@ -491,6 +607,7 @@ void PaletteViewer::createPaletteToolBar() {connect(addPage, SIGNAL(triggered()), this, SLOT(addNewPage()));m_paletteToolBar->addAction(addPage);+ m_toolbarParts.insert(TBVisNewStylePage, addPage);}QIcon newColorIcon = createQIcon("newstyle");@@ -499,15 +616,17 @@ void PaletteViewer::createPaletteToolBar() {connect(addColor, SIGNAL(triggered()), this, SLOT(addNewColor()));m_paletteToolBar->addAction(addColor);- m_paletteToolBar->addSeparator();+ m_toolbarParts.insert(TBVisNewStylePage, addColor);+ m_toolbarParts.insert(TBVisNewStylePage, m_paletteToolBar->addSeparator());// KeyFrame buttonif (m_viewType != CLEANUP_PALETTE) {m_keyFrameButton = new PaletteKeyframeNavigator(m_paletteToolBar);- m_paletteToolBar->addWidget(m_keyFrameButton);- m_paletteToolBar->addSeparator();+ m_toolbarParts.insert(TBVisKeyframe, m_paletteToolBar->addWidget(m_keyFrameButton));+ m_toolbarParts.insert(TBVisKeyframe, m_paletteToolBar->addSeparator());m_keyFrameButton->setSelection(m_pageViewer->getSelection());}+updatePaletteToolBar();}diff --git a/toonz/sources/toonzqt/paletteviewergui.cpp b/toonz/sources/toonzqt/paletteviewergui.cppindex e6fbc7236..6724e1fa2 100644--- a/toonz/sources/toonzqt/paletteviewergui.cpp+++ b/toonz/sources/toonzqt/paletteviewergui.cpp@@ -1153,6 +1153,7 @@ void PageViewer::contextMenuEvent(QContextMenuEvent *event) {QAction *openStyleControlAct = cmd->getAction("MI_OpenStyleControl");menu.addAction(openStyleControlAct);QAction *openStyleNameEditorAct = menu.addAction(tr("Name Editor"));+ openStyleNameEditorAct->setIcon(createQIcon("rename", false, true));connect(openStyleNameEditorAct, &QAction::triggered, [&]() {if (!m_styleNameEditor) {m_styleNameEditor = new StyleNameEditor(this);@@ -1206,9 +1207,11 @@ void PageViewer::contextMenuEvent(QContextMenuEvent *event) {if (m_page) {menu.addSeparator();- QAction *newStyle = menu.addAction(tr("New Style"));+ QIcon newStyleIco = createQIcon("new_style", false, true);+ QAction *newStyle = menu.addAction(newStyleIco, tr("New Style"));connect(newStyle, SIGNAL(triggered()), SLOT(addNewColor()));- QAction *newPage = menu.addAction(tr("New Page"));+ QIcon newPageIco = createQIcon("new_page", false, true);+ QAction *newPage = menu.addAction(newPageIco, tr("New Page"));connect(newPage, SIGNAL(triggered()), SLOT(addNewPage()));}