OpenToonz - An open-source full-featured 2D animation creation software
C
Move button to ToolBar
Abel You0ace1b53acbb
diff --git a/toonz/sources/toonz/colormodelviewer.cpp b/toonz/sources/toonz/colormodelviewer.cppindex 5293a759f..b6037b63a 100644--- a/toonz/sources/toonz/colormodelviewer.cpp+++ b/toonz/sources/toonz/colormodelviewer.cpp@@ -1,4 +1,5 @@-+#include <Qdebug>+#include <qstack.h>// Tnz6 includes#include "colormodelviewer.h"@@ -51,6 +52,7 @@#include <QUrl>#include <QMenu>#include <qtoolbutton.h>+#include <tpanels.h>#define LINES "Lines"#define AREAS "Areas"@@ -106,8 +108,10 @@ ColorModelViewer::ColorModelViewer(QWidget *parent)pickLineStyles->setToolTip(tip);pickLineStyles->setCheckable(true);- // TODO: add to right place- this->layout()->addWidget(pickLineStyles);+ QToolBar *toolBar = this->findChild<QToolBar *>("FlipConsolePlayToolBar");+ if (toolBar) {+ toolBar->addWidget(pickLineStyles);+ }setToolCursor(m_imageViewer, ToolCursor::PickerCursor);diff --git a/toonz/sources/toonz/flipbook.cpp b/toonz/sources/toonz/flipbook.cppindex 4b946dc5a..f62187eee 100644--- a/toonz/sources/toonz/flipbook.cpp+++ b/toonz/sources/toonz/flipbook.cpp@@ -232,8 +232,6 @@ FlipBook::FlipBook(QWidget *parent, QString viewerTitle,->getOutputProperties()->getFrameRate());- mainLayout->addWidget(m_flipConsole);-m_previewUpdateTimer.setSingleShot(true);ret = ret && connect(parentWidget(), SIGNAL(closeButtonPressed()), this,diff --git a/toonz/sources/toonz/flipbook.h b/toonz/sources/toonz/flipbook.hindex 0c0922e49..2d1322eab 100644--- a/toonz/sources/toonz/flipbook.h+++ b/toonz/sources/toonz/flipbook.h@@ -190,7 +190,7 @@ protected:public:enum Flags { eDontKeepFilesOpened = 0x1 };-+FlipBook(QWidget *parent = 0, QString viewerTitle = QString(),std::vector<int> flipConsoleButtonMask ={FlipConsole::eFilledRaster, FlipConsole::eDefineSubCamera,