diff --git a/toonz/sources/toonz/frameheadgadget.cpp b/toonz/sources/toonz/frameheadgadget.cpp index 0e8f1d8..2d9cf03 100644 --- a/toonz/sources/toonz/frameheadgadget.cpp +++ b/toonz/sources/toonz/frameheadgadget.cpp @@ -660,43 +660,3 @@ public: } } onionSkinToggle; - -class ZeroThickToggle : public MenuItemHandler { -public: - ZeroThickToggle() : MenuItemHandler(MI_ZeroThick) {} - void execute() { - QAction *action = CommandManager::instance()->getAction(MI_ZeroThick); - if (!action) - return; - bool checked = action->isChecked(); - enableZeroThick(checked); - } - - static void enableZeroThick(bool enable = true) { - Preferences::instance()->setShow0ThickLines(enable); - TApp::instance()->getCurrentScene()->notifySceneChanged(); - } -} ZeroThickToggle; - - -void ZeroThickToggleGui::addZeroThickCommand(QMenu *menu) { - static ZeroThickToggleHandler switcher; - if (Preferences::instance()->getShow0ThickLines()) { - QAction *hideZeroThick = menu->addAction(QString(QObject::tr("Hide Zero Thickness Lines"))); - menu->connect(hideZeroThick, SIGNAL(triggered()), - &switcher, SLOT(deactivate())); - } - else { - QAction *showZeroThick = menu->addAction(QString(QObject::tr("Show Zero Thickness Lines"))); - menu->connect(showZeroThick, SIGNAL(triggered()), - &switcher, SLOT(activate())); - } -} - -void ZeroThickToggleGui::ZeroThickToggleHandler::activate() { - ZeroThickToggle::enableZeroThick(true); -} - -void ZeroThickToggleGui::ZeroThickToggleHandler::deactivate() { - ZeroThickToggle::enableZeroThick(false); -} \ No newline at end of file diff --git a/toonz/sources/toonz/frameheadgadget.h b/toonz/sources/toonz/frameheadgadget.h index 3de2db6..0d98993 100644 --- a/toonz/sources/toonz/frameheadgadget.h +++ b/toonz/sources/toonz/frameheadgadget.h @@ -87,18 +87,4 @@ public: bool eventFilter(QObject *obj, QEvent *event); }; -namespace ZeroThickToggleGui { - void addZeroThickCommand(QMenu* menu); - - class ZeroThickToggleHandler : public QObject { - Q_OBJECT - - public slots: - void activate(); - void deactivate(); - }; - - -} //Namespace ZeroThickToggleGui - #endif diff --git a/toonz/sources/toonz/sceneviewercontextmenu.cpp b/toonz/sources/toonz/sceneviewercontextmenu.cpp index f6af261..6ea36a1 100644 --- a/toonz/sources/toonz/sceneviewercontextmenu.cpp +++ b/toonz/sources/toonz/sceneviewercontextmenu.cpp @@ -7,7 +7,6 @@ #include "tapp.h" #include "menubarcommandids.h" #include "onionskinmaskgui.h" -#include "frameheadgadget.h" // TnzTools includes #include "tools/toolhandle.h" @@ -26,6 +25,7 @@ #include "toonz/tframehandle.h" #include "toonz/tobjecthandle.h" #include "toonz/tstageobjecttree.h" +#include "toonz/tscenehandle.h" #include "toonz/txshcolumn.h" #include "toonz/tstageobjectspline.h" #include "toonz/tstageobjectid.h" @@ -392,3 +392,45 @@ void SceneViewerContextMenu::savePreviewedFrames() { SceneViewer::SUBCAMERA_PREVIEW) ->saveRenderedFrames(); } + + + +class ZeroThickToggle : public MenuItemHandler { +public: + ZeroThickToggle() : MenuItemHandler(MI_ZeroThick) {} + void execute() { + QAction *action = CommandManager::instance()->getAction(MI_ZeroThick); + if (!action) + return; + bool checked = action->isChecked(); + enableZeroThick(checked); + } + + static void enableZeroThick(bool enable = true) { + Preferences::instance()->setShow0ThickLines(enable); + TApp::instance()->getCurrentScene()->notifySceneChanged(); + } +} ZeroThickToggle; + + +void ZeroThickToggleGui::addZeroThickCommand(QMenu *menu) { + static ZeroThickToggleHandler switcher; + if (Preferences::instance()->getShow0ThickLines()) { + QAction *hideZeroThick = menu->addAction(QString(QObject::tr("Hide Zero Thickness Lines"))); + menu->connect(hideZeroThick, SIGNAL(triggered()), + &switcher, SLOT(deactivate())); + } + else { + QAction *showZeroThick = menu->addAction(QString(QObject::tr("Show Zero Thickness Lines"))); + menu->connect(showZeroThick, SIGNAL(triggered()), + &switcher, SLOT(activate())); + } +} + +void ZeroThickToggleGui::ZeroThickToggleHandler::activate() { + ZeroThickToggle::enableZeroThick(true); +} + +void ZeroThickToggleGui::ZeroThickToggleHandler::deactivate() { + ZeroThickToggle::enableZeroThick(false); +} \ No newline at end of file diff --git a/toonz/sources/toonz/sceneviewercontextmenu.h b/toonz/sources/toonz/sceneviewercontextmenu.h index ce656a4..c1fba3b 100644 --- a/toonz/sources/toonz/sceneviewercontextmenu.h +++ b/toonz/sources/toonz/sceneviewercontextmenu.h @@ -36,4 +36,18 @@ public slots: void onSetCurrent(); }; +namespace ZeroThickToggleGui { + void addZeroThickCommand(QMenu* menu); + + class ZeroThickToggleHandler : public QObject { + Q_OBJECT + + public slots: + void activate(); + void deactivate(); + }; + + +} //Namespace ZeroThickToggleGui + #endif