Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

Dockable Locator pane

manongjohn6a2a67dbabb6
diff --git a/toonz/sources/common/tgl/tgldisplaylistsmanager.cpp b/toonz/sources/common/tgl/tgldisplaylistsmanager.cpp
index d4e918172..dd7386930 100644
--- a/toonz/sources/common/tgl/tgldisplaylistsmanager.cpp
+++ b/toonz/sources/common/tgl/tgldisplaylistsmanager.cpp
@@ -72,7 +72,7 @@ void TGLDisplayListsManager::releaseContext(TGlContext context) {
static_cast<Observer *>(*ot)->onDisplayListDestroyed(dlSpaceId);
// Then, destroy stuff
- delete m_proxies[dlSpaceId].m_proxy;
+ if (!m_proxies[dlSpaceId].m_proxy) delete m_proxies[dlSpaceId].m_proxy;
m_proxies.erase(dlSpaceId);
}
diff --git a/toonz/sources/toonz/floatingpanelcommand.cpp b/toonz/sources/toonz/floatingpanelcommand.cpp
index 26e2f2013..943669929 100644
--- a/toonz/sources/toonz/floatingpanelcommand.cpp
+++ b/toonz/sources/toonz/floatingpanelcommand.cpp
@@ -110,11 +110,13 @@ TPanel *OpenFloatingPanel::getOrOpenFloatingPanel(
TPanel *panel = list.at(i);
// we want floating panel (possibly hidden) with the correct name
- if (panel->getPanelType() == panelType && panel->isFloating()) {
+ // Locator panels can only exist 1x per room
+ if (panel->getPanelType() == panelType &&
+ (panel->isFloating() || panelType == "Locator")) {
// if there is already a floating panel and MultipleInstances are
// not allowed we must use it
if (!panel->areMultipleInstancesAllowed() && !panel->isHidden()) {
- activateWidget(panel);
+ if (panel->isFloating()) activateWidget(panel);
return panel;
}
diff --git a/toonz/sources/toonz/locatorpopup.cpp b/toonz/sources/toonz/locatorpopup.cpp
index 434ca520e..0c79f2372 100644
--- a/toonz/sources/toonz/locatorpopup.cpp
+++ b/toonz/sources/toonz/locatorpopup.cpp
@@ -12,8 +12,8 @@
#include <QVBoxLayout>
-LocatorPopup::LocatorPopup(QWidget *parent)
- : QDialog(parent), m_initialZoom(true) {
+LocatorPopup::LocatorPopup(QWidget *parent, Qt::WindowFlags flags)
+ : QFrame(parent), m_initialZoom(true) {
m_viewer = new SceneViewer(NULL);
m_viewer->setParent(parent);
m_viewer->setIsLocator();
@@ -65,6 +65,8 @@ void LocatorPopup::showEvent(QShowEvent *) {
SLOT(changeWindowTitle()));
assert(ret);
+ app->setActiveLocator(this);
+
changeWindowTitle();
}
@@ -74,6 +76,7 @@ void LocatorPopup::hideEvent(QHideEvent *) {
TApp *app = TApp::instance();
disconnect(app->getCurrentLevel());
disconnect(app->getCurrentFrame());
+ if (app->getActiveLocator() == this) app->setActiveLocator(0);
}
//-----------------------------------------------------------------------------
diff --git a/toonz/sources/toonz/locatorpopup.h b/toonz/sources/toonz/locatorpopup.h
index 2dc3448a5..29cb587ba 100644
--- a/toonz/sources/toonz/locatorpopup.h
+++ b/toonz/sources/toonz/locatorpopup.h
@@ -4,7 +4,17 @@
#define LOCATORPOPUP_H
#include "tgeometry.h"
-#include <QDialog>
+#include "toonzqt/dvdialog.h"
+
+#undef DVAPI
+#undef DVVAR
+#ifdef TOONZQT_EXPORTS
+#define DVAPI DV_EXPORT_API
+#define DVVAR DV_EXPORT_VAR
+#else
+#define DVAPI DV_IMPORT_API
+#define DVVAR DV_IMPORT_VAR
+#endif
class SceneViewer;
@@ -12,13 +22,15 @@ class SceneViewer;
// LoactorPopup
//-----------------------------------------------------------------------------
-class LocatorPopup : public QDialog {
+class LocatorPopup : public QFrame {
Q_OBJECT
SceneViewer* m_viewer;
bool m_initialZoom;
public:
- LocatorPopup(QWidget* parent = 0);
+ LocatorPopup(QWidget* parent = 0, Qt::WindowFlags flags = Qt::WindowFlags());
+ ~LocatorPopup() {}
+
SceneViewer* viewer() { return m_viewer; }
void onChangeViewAff(const TPointD& curPos);
diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp
index 94bd7bdf1..1f653ea8c 100644
--- a/toonz/sources/toonz/mainwindow.cpp
+++ b/toonz/sources/toonz/mainwindow.cpp
@@ -1142,6 +1142,11 @@ void MainWindow::onCurrentRoomChanged(int newRoomIndex) {
for (int i = 0; i < paneList.size(); i++) {
TPanel *pane = paneList.at(i);
if (pane->isFloating() && !pane->isHidden()) {
+ // Close floating Locator panes
+ if (pane->getPanelType() == "Locator") {
+ pane->close();
+ continue;
+ }
QRect oldGeometry = pane->geometry();
// Just setting the new parent is not enough for the new layout manager.
// Must be removed from the old and added to the new.
@@ -2278,6 +2283,7 @@ void MainWindow::defineActions() {
false);
createMenuWindowsAction(MI_CustomPanelEditor,
QT_TR_NOOP("&Custom Panel Editor..."), "", "");
+ createMenuWindowsAction(MI_OpenLocator, QT_TR_NOOP("&Locator"), "", "locator");
menuAct =
createToggle(MI_DockingCheck, QT_TR_NOOP("&Lock Room Panes"), "",
diff --git a/toonz/sources/toonz/menubar.cpp b/toonz/sources/toonz/menubar.cpp
index 373cd0d85..1a48acc0f 100644
--- a/toonz/sources/toonz/menubar.cpp
+++ b/toonz/sources/toonz/menubar.cpp
@@ -1425,6 +1425,7 @@ QMenuBar *StackedMenuBar::createFullMenuBar() {
addMenuItem(windowsMenu, MI_OpenSchematic);
addMenuItem(windowsMenu, MI_FxParamEditor);
addMenuItem(windowsMenu, MI_OpenFilmStrip);
+ addMenuItem(windowsMenu, MI_OpenLocator);
windowsMenu->addSeparator();
addMenuItem(windowsMenu, MI_OpenFileBrowser);
addMenuItem(windowsMenu, MI_OpenPreproductionBoard);
diff --git a/toonz/sources/toonz/menubarcommandids.h b/toonz/sources/toonz/menubarcommandids.h
index 7f4f6e8d8..0b5e5741d 100644
--- a/toonz/sources/toonz/menubarcommandids.h
+++ b/toonz/sources/toonz/menubarcommandids.h
@@ -496,4 +496,5 @@
#define MI_PrevTaggedFrame "MI_PrevTaggedFrame"
#define MI_ClearTags "MI_ClearTags"
+#define MI_OpenLocator "MI_OpenLocator"
#endif
diff --git a/toonz/sources/toonz/sceneviewer.cpp b/toonz/sources/toonz/sceneviewer.cpp
index e021a2a41..95bfd9509 100644
--- a/toonz/sources/toonz/sceneviewer.cpp
+++ b/toonz/sources/toonz/sceneviewer.cpp
@@ -798,7 +798,6 @@ SceneViewer::SceneViewer(ImageUtils::FullScreenWidget *parent)
, m_topRasterPos()
, m_toolDisableReason("")
, m_editPreviewSubCamera(false)
- , m_locator(NULL)
, m_isLocator(false)
, m_isBusyOnTabletMove(false) {
m_visualSettings.m_sceneProperties =
@@ -1196,10 +1195,6 @@ void SceneViewer::hideEvent(QHideEvent *) {
disconnect(m_stopMotion, SIGNAL(liveViewStopped()), this,
SLOT(onStopMotionLiveViewStopped()));
}
-#endif
-
- // hide locator
- if (m_locator && m_locator->isVisible()) m_locator->hide();
}
int SceneViewer::getVGuideCount() {
@@ -2065,8 +2060,11 @@ void SceneViewer::drawScene() {
// Guided Drawing Check
int useGuidedDrawing = Preferences::instance()->getGuidedDrawingType();
TTool *tool = app->getCurrentTool()->getTool();
- int guidedFrontStroke = tool ? tool->getViewer()->getGuidedFrontStroke() : -1;
- int guidedBackStroke = tool ? tool->getViewer()->getGuidedBackStroke() : -1;
+ int guidedFrontStroke = tool && tool->getViewer()
+ ? tool->getViewer()->getGuidedFrontStroke()
+ : -1;
+ int guidedBackStroke =
+ tool && tool->getViewer() ? tool->getViewer()->getGuidedBackStroke() : -1;
m_minZ = 0;
if (is3DView()) {
diff --git a/toonz/sources/toonz/sceneviewer.h b/toonz/sources/toonz/sceneviewer.h
index a7b2f7bdd..3c7fc279b 100644
--- a/toonz/sources/toonz/sceneviewer.h
+++ b/toonz/sources/toonz/sceneviewer.h
@@ -172,7 +172,6 @@ class SceneViewer final : public GLWidgetForHighDpi,
TOP_3D,
} m_current3DDevice;
- LocatorPopup *m_locator;
bool m_isLocator;
bool m_isStyleShortcutSwitchable;
diff --git a/toonz/sources/toonz/sceneviewerevents.cpp b/toonz/sources/toonz/sceneviewerevents.cpp
index 69057939d..0061367e1 100644
--- a/toonz/sources/toonz/sceneviewerevents.cpp
+++ b/toonz/sources/toonz/sceneviewerevents.cpp
@@ -215,12 +215,11 @@ void SceneViewer::onButtonPressed(FlipConsole::EGadget button) {
break;
// open locator. Create one for the first time
- case FlipConsole::eLocator:
- if (!m_locator) m_locator = new LocatorPopup(this);
- m_locator->show();
- m_locator->raise();
- m_locator->activateWindow();
+ case FlipConsole::eLocator: {
+ QAction *action = CommandManager::instance()->getAction(MI_OpenLocator);
+ action->trigger();
break;
+ }
case FlipConsole::eZoomIn:
zoomIn();
@@ -623,13 +622,13 @@ void SceneViewer::onMove(const TMouseEvent &event) {
// grab screen picking for stop motion live view zoom
if ((event.buttons() & Qt::LeftButton) &&
StopMotion::instance()->m_canon->m_pickLiveViewZoom) {
- StopMotion::instance()->m_canon->makeZoomPoint(pos);
- return;
+ StopMotion::instance()->m_canon->makeZoomPoint(pos);
+ return;
}
#endif
-
- if (m_locator) {
- m_locator->onChangeViewAff(worldPos);
+ LocatorPopup *locator = TApp::instance()->getActiveLocator();
+ if (!m_isLocator && locator) {
+ locator->onChangeViewAff(worldPos);
}
TObjectHandle *objHandle = TApp::instance()->getCurrentObject();
diff --git a/toonz/sources/toonz/tapp.h b/toonz/sources/toonz/tapp.h
index a6f092f4e..e4230420d 100644
--- a/toonz/sources/toonz/tapp.h
+++ b/toonz/sources/toonz/tapp.h
@@ -27,6 +27,7 @@ class TMainWindow;
class ComboViewerPanel;
class SceneViewer;
class XsheetViewer;
+class LocatorPopup;
//=============================================================================
// TXsheeHandle
@@ -83,6 +84,7 @@ class TApp final : public QObject,
SceneViewer *m_activeViewer;
XsheetViewer *m_xsheetViewer;
+ LocatorPopup *m_activeLocator;
int m_autosavePeriod; // minutes
bool m_autosaveSuspended;
@@ -209,6 +211,14 @@ public:
bool isSaveInProgress() { return m_saveInProgress; }
void setSaveInProgress(bool inProgress) { m_saveInProgress = inProgress; }
+ void setActiveLocator(LocatorPopup *locator) {
+ if (m_activeLocator == locator) return;
+ m_activeLocator = locator;
+ emit activeLocatorChanged();
+ }
+
+ LocatorPopup *getActiveLocator() const { return m_activeLocator; }
+
protected:
bool eventFilter(QObject *obj, QEvent *event) override;
@@ -253,6 +263,7 @@ signals:
void
activeViewerChanged(); // TODO: put widgets-related stuffs in some new handle
+ void activeLocatorChanged();
};
#endif // TAPP_H
diff --git a/toonz/sources/toonz/tpanels.cpp b/toonz/sources/toonz/tpanels.cpp
index 8481780f8..21f57f13a 100644
--- a/toonz/sources/toonz/tpanels.cpp
+++ b/toonz/sources/toonz/tpanels.cpp
@@ -85,6 +85,9 @@
#include "toonz/fxcommand.h"
#include "toonz/tstageobjectcmd.h"
+
+#include "../../toonz/locatorpopup.h"
+
// TnzBase includes
#include "trasterfx.h"
#include "toutputproperties.h"
@@ -1652,8 +1655,46 @@ public:
void execute() override { zoomAndFitPanel(true); }
} zoomInAndFitPanel;
-class ZoomOutAndFitPanel final : public MenuItemHandler {
+//=============================================================================
+OpenFloatingPanel openFxBrowserCommand(MI_InsertFx, "FxBrowser",
+ QObject::tr("Fx Browser"));
+
+//-----------------------------------------------------------------------------
+
+//=============================================================================
+// LocatorPanel
+//-----------------------------------------------------------------------------
+
+LocatorPanel::LocatorPanel(QWidget *parent) : TPanel(parent) {
+ m_locator = new LocatorPopup(parent);
+
+ setWidget(m_locator);
+}
+
+//=============================================================================
+// LocatorFactory
+//-----------------------------------------------------------------------------
+
+class LocatorFactory final : public TPanelFactory {
public:
- ZoomOutAndFitPanel() : MenuItemHandler("MI_ZoomOutAndFitPanel") {}
- void execute() override { zoomAndFitPanel(false); }
-} zoomOutAndFitPanel;
\ No newline at end of file
+ LocatorFactory() : TPanelFactory("Locator") {}
+
+ TPanel *createPanel(QWidget *parent) override {
+ LocatorPanel *panel = new LocatorPanel(parent);
+ panel->move(qApp->desktop()->screenGeometry(panel).center());
+ panel->setObjectName(getPanelType());
+ panel->setWindowTitle(QObject::tr("Locator"));
+ panel->allowMultipleInstances(false);
+ panel->getTitleBar()->showTitleBar(TApp::instance()->getShowTitleBars());
+ connect(TApp::instance(), SIGNAL(showTitleBars(bool)), panel->getTitleBar(),
+ SLOT(showTitleBar(bool)));
+ return panel;
+ }
+
+ void initialize(TPanel *panel) override { assert(0); }
+
+} LocatorFactory;
+
+//=============================================================================
+OpenFloatingPanel openLocatorCommand(MI_OpenLocator, "Locator",
+ QObject::tr("Locator"));
diff --git a/toonz/sources/toonz/tpanels.h b/toonz/sources/toonz/tpanels.h
index 1102944a3..19729f8c7 100644
--- a/toonz/sources/toonz/tpanels.h
+++ b/toonz/sources/toonz/tpanels.h
@@ -31,6 +31,9 @@ class FxSettings;
class VectorGuidedDrawingPane;
class FxSelection;
class StageObjectSelection;
+class XsheetViewer;
+class InsertFxPopup;
+class LocatorPopup;
//=========================================================
// PaletteViewerPanel
@@ -347,4 +350,71 @@ public:
VectorGuidedDrawingPanel(QWidget *parent);
};
+//=========================================================
+// XsheetViewerPanel
+//---------------------------------------------------------
+
+class XsheetViewerPanel final : public TPanel {
+ Q_OBJECT
+
+ XsheetViewer *m_xsheetViewer;
+
+public:
+ XsheetViewerPanel(QWidget *parent = 0);
+
+ void reset() override;
+};
+
+//=========================================================
+// TimelineViewerPanel
+//---------------------------------------------------------
+
+class TimelineViewerPanel final : public TPanel {
+ Q_OBJECT
+
+ XsheetViewer *m_timelineViewer;
+
+public:
+ TimelineViewerPanel(QWidget *parent = 0);
+
+ void reset() override;
+};
+
+//=========================================================
+// AlignmentPanel
+//---------------------------------------------------------
+
+class AlignmentPanel final : public TPanel {
+ Q_OBJECT
+
+public:
+ AlignmentPanel(QWidget *parent);
+};
+
+//=========================================================
+// FxBrowserPanel
+//---------------------------------------------------------
+
+class FxBrowserPanel final : public TPanel {
+ Q_OBJECT
+
+ InsertFxPopup *m_fxBrowser;
+
+public:
+ FxBrowserPanel(QWidget *parent);
+};
+
+//=========================================================
+// LocatorPanel
+//---------------------------------------------------------
+
+class LocatorPanel final : public TPanel {
+ Q_OBJECT
+
+ LocatorPopup *m_locator;
+
+public:
+ LocatorPanel(QWidget *parent);
+};
+
#endif