2016-03-19 06:57:51 +13:00
|
|
|
|
|
|
|
#include "toonzqt/schematicviewer.h"
|
|
|
|
|
|
|
|
// TnzQt includes
|
2018-07-24 19:52:45 +12:00
|
|
|
#include "toonzqt/fxtypes.h"
|
2016-03-19 06:57:51 +13:00
|
|
|
#include "toonzqt/schematicnode.h"
|
|
|
|
#include "toonzqt/fxschematicnode.h"
|
|
|
|
#include "toonzqt/schematicgroupeditor.h"
|
|
|
|
#include "toonzqt/stageschematicscene.h"
|
|
|
|
#include "toonzqt/fxschematicscene.h"
|
|
|
|
#include "toonzqt/menubarcommand.h"
|
|
|
|
#include "toonzqt/tselectionhandle.h"
|
|
|
|
#include "toonzqt/gutil.h"
|
|
|
|
#include "toonzqt/imageutils.h"
|
|
|
|
#include "toonzqt/dvscrollwidget.h"
|
2020-04-17 19:02:53 +12:00
|
|
|
#include "toonzqt/fxselection.h"
|
|
|
|
#include "stageobjectselection.h"
|
2016-03-19 06:57:51 +13:00
|
|
|
|
|
|
|
// TnzLib includes
|
|
|
|
#include "toonz/txsheethandle.h"
|
|
|
|
#include "toonz/tcolumnhandle.h"
|
|
|
|
#include "toonz/tobjecthandle.h"
|
|
|
|
#include "toonz/tfxhandle.h"
|
|
|
|
#include "toonz/txsheet.h"
|
|
|
|
#include "toonz/txshlevelcolumn.h"
|
|
|
|
#include "toonz/tcolumnfx.h"
|
|
|
|
#include "toonz/txshzeraryfxcolumn.h"
|
|
|
|
#include "toonz/preferences.h"
|
|
|
|
#include "toonz/fxdag.h"
|
|
|
|
#include "toonz/tapplication.h"
|
|
|
|
#include "toonz/tscenehandle.h"
|
2018-07-24 19:52:45 +12:00
|
|
|
#include "toonz/txshleveltypes.h"
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2018-07-20 22:15:22 +12:00
|
|
|
#include "../toonz/menubarcommandids.h"
|
|
|
|
|
2018-07-26 01:58:49 +12:00
|
|
|
#include "tools/cursormanager.h"
|
|
|
|
#include "tools/cursors.h"
|
2021-02-14 19:09:25 +13:00
|
|
|
#include "tools/toolcommandids.h"
|
2018-07-26 01:58:49 +12:00
|
|
|
|
2016-03-19 06:57:51 +13:00
|
|
|
// Qt includes
|
|
|
|
#include <QGraphicsSceneMouseEvent>
|
|
|
|
#include <QMouseEvent>
|
2016-03-27 13:30:32 +13:00
|
|
|
#include <QGraphicsItem>
|
2016-03-19 06:57:51 +13:00
|
|
|
#include <QToolBar>
|
|
|
|
#include <QToolButton>
|
|
|
|
#include <QMenu>
|
|
|
|
#include <QIcon>
|
|
|
|
#include <QAction>
|
|
|
|
#include <QMainWindow>
|
|
|
|
#include <QVBoxLayout>
|
2018-07-20 22:15:22 +12:00
|
|
|
#include <QGestureEvent>
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2018-07-22 18:37:49 +12:00
|
|
|
#include <QDebug>
|
|
|
|
|
2016-03-19 06:57:51 +13:00
|
|
|
// STD includes
|
|
|
|
#include "assert.h"
|
|
|
|
#include "math.h"
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
namespace {
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-29 18:17:12 +12:00
|
|
|
class SchematicZoomer final : public ImageUtils::ShortcutZoomer {
|
2016-03-19 06:57:51 +13:00
|
|
|
public:
|
2016-06-15 18:43:10 +12:00
|
|
|
SchematicZoomer(QWidget *parent) : ShortcutZoomer(parent) {}
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2019-08-05 20:37:40 +12:00
|
|
|
bool zoom(bool zoomin, bool resetView) override {
|
|
|
|
static_cast<SchematicSceneViewer *>(getWidget())->zoomQt(zoomin, resetView);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
bool resetZoom() override {
|
|
|
|
static_cast<SchematicSceneViewer *>(getWidget())->normalizeScene();
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
bool fit() override {
|
|
|
|
static_cast<SchematicSceneViewer *>(getWidget())->fitScene();
|
2016-06-15 18:43:10 +12:00
|
|
|
return true;
|
|
|
|
}
|
2016-03-19 06:57:51 +13:00
|
|
|
};
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
} // namespace
|
2016-03-19 06:57:51 +13:00
|
|
|
|
|
|
|
//==================================================================
|
|
|
|
//
|
|
|
|
// SchematicScene
|
|
|
|
//
|
|
|
|
//==================================================================
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
SchematicScene::SchematicScene(QWidget *parent) : QGraphicsScene(parent) {
|
|
|
|
setSceneRect(0, 0, 50000, 50000);
|
|
|
|
setItemIndexMethod(NoIndex);
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
SchematicScene::~SchematicScene() { clearAllItems(); }
|
2016-03-19 06:57:51 +13:00
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
void SchematicScene::showEvent(QShowEvent *se) {
|
|
|
|
TSelectionHandle *selHandle = TSelectionHandle::getCurrent();
|
|
|
|
connect(selHandle, SIGNAL(selectionSwitched(TSelection *, TSelection *)),
|
|
|
|
this, SLOT(onSelectionSwitched(TSelection *, TSelection *)));
|
|
|
|
clearSelection();
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
void SchematicScene::hideEvent(QHideEvent *se) {
|
|
|
|
TSelectionHandle *selHandle = TSelectionHandle::getCurrent();
|
|
|
|
disconnect(selHandle, SIGNAL(selectionSwitched(TSelection *, TSelection *)),
|
|
|
|
this, SLOT(onSelectionSwitched(TSelection *, TSelection *)));
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
|
|
|
/*! Removes and then deletes all item in the scene.
|
2019-08-05 20:37:40 +12:00
|
|
|
*/
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
void SchematicScene::clearAllItems() {
|
|
|
|
clearSelection();
|
|
|
|
m_highlightedLinks.clear();
|
|
|
|
QList<SchematicWindowEditor *> editors;
|
|
|
|
QList<SchematicNode *> nodes;
|
|
|
|
QList<SchematicLink *> links;
|
|
|
|
int i;
|
|
|
|
QList<QGraphicsItem *> sceneItems = items();
|
|
|
|
int size = sceneItems.size();
|
|
|
|
// create nodes and links list
|
|
|
|
for (i = 0; i < size; i++) {
|
|
|
|
QGraphicsItem *item = sceneItems.at(i);
|
|
|
|
SchematicWindowEditor *editor = dynamic_cast<SchematicWindowEditor *>(item);
|
|
|
|
SchematicNode *node = dynamic_cast<SchematicNode *>(item);
|
|
|
|
SchematicLink *link = dynamic_cast<SchematicLink *>(item);
|
|
|
|
if (editor) editors.append(editor);
|
|
|
|
if (node) nodes.append(node);
|
|
|
|
if (link) links.append(link);
|
|
|
|
}
|
|
|
|
while (links.size() > 0) {
|
|
|
|
SchematicLink *link = links.back();
|
|
|
|
removeItem(link);
|
|
|
|
links.removeLast();
|
|
|
|
SchematicPort *startPort = link->getStartPort();
|
|
|
|
SchematicPort *endPort = link->getEndPort();
|
|
|
|
if (startPort) startPort->removeLink(link);
|
|
|
|
if (endPort) endPort->removeLink(link);
|
|
|
|
delete link;
|
|
|
|
}
|
|
|
|
while (editors.size() > 0) {
|
|
|
|
SchematicWindowEditor *editor = editors.back();
|
|
|
|
removeItem(editor);
|
|
|
|
editors.removeLast();
|
|
|
|
delete editor;
|
|
|
|
}
|
|
|
|
while (nodes.size() > 0) {
|
|
|
|
SchematicNode *node = nodes.back();
|
|
|
|
removeItem(node);
|
|
|
|
nodes.removeLast();
|
|
|
|
delete node;
|
|
|
|
}
|
|
|
|
assert(items().size() == 0);
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
/*! check if any item exists in the rect
|
2019-08-05 20:37:40 +12:00
|
|
|
*/
|
2016-06-15 18:43:10 +12:00
|
|
|
bool SchematicScene::isAnEmptyZone(const QRectF &rect) {
|
|
|
|
QList<QGraphicsItem *> allItems = items();
|
|
|
|
for (auto const level : allItems) {
|
|
|
|
SchematicNode *node = dynamic_cast<SchematicNode *>(level);
|
|
|
|
if (!node) continue;
|
|
|
|
FxSchematicNode *fxNode = dynamic_cast<FxSchematicNode *>(node);
|
|
|
|
if (fxNode && fxNode->isA(eXSheetFx)) continue;
|
|
|
|
if (node->boundingRect().translated(node->scenePos()).intersects(rect))
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
|
|
|
QVector<SchematicNode *> SchematicScene::getPlacedNode(SchematicNode *node) {
|
|
|
|
QRectF rect = node->boundingRect().translated(node->scenePos());
|
|
|
|
QList<QGraphicsItem *> allItems = items();
|
|
|
|
QVector<SchematicNode *> nodes;
|
|
|
|
for (auto const item : allItems) {
|
|
|
|
SchematicNode *placedNode = dynamic_cast<SchematicNode *>(item);
|
|
|
|
if (!placedNode || placedNode == node) continue;
|
|
|
|
QRectF nodeRect =
|
|
|
|
placedNode->boundingRect().translated(placedNode->scenePos());
|
|
|
|
QRectF enlargedRect = rect.adjusted(-10, -10, 10, 10);
|
|
|
|
if (enlargedRect.contains(nodeRect)) nodes.push_back(placedNode);
|
|
|
|
}
|
|
|
|
return nodes;
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//==================================================================
|
|
|
|
//
|
|
|
|
// SchematicSceneViewer
|
|
|
|
//
|
|
|
|
//==================================================================
|
|
|
|
|
|
|
|
SchematicSceneViewer::SchematicSceneViewer(QWidget *parent)
|
2016-06-15 18:43:10 +12:00
|
|
|
: QGraphicsView(parent)
|
|
|
|
, m_buttonState(Qt::NoButton)
|
|
|
|
, m_oldWinPos()
|
|
|
|
, m_oldScenePos()
|
|
|
|
, m_firstShowing(true) {
|
|
|
|
setObjectName("SchematicSceneViewer");
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
|
|
|
|
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
|
|
|
|
setDragMode(QGraphicsView::NoDrag);
|
|
|
|
setTransformationAnchor(QGraphicsView::NoAnchor);
|
|
|
|
setRenderHint(QPainter::SmoothPixmapTransform);
|
|
|
|
setRenderHint(QPainter::TextAntialiasing);
|
|
|
|
setRenderHint(QPainter::Antialiasing);
|
|
|
|
setInteractive(true);
|
|
|
|
setViewportUpdateMode(QGraphicsView::SmartViewportUpdate);
|
|
|
|
show();
|
2018-07-20 22:15:22 +12:00
|
|
|
|
|
|
|
setAttribute(Qt::WA_AcceptTouchEvents);
|
|
|
|
grabGesture(Qt::SwipeGesture);
|
|
|
|
grabGesture(Qt::PanGesture);
|
|
|
|
grabGesture(Qt::PinchGesture);
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
SchematicSceneViewer::~SchematicSceneViewer() {}
|
2016-03-19 06:57:51 +13:00
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
/*! Reimplemets the QGraphicsView::mousePressEvent()
|
2019-08-05 20:37:40 +12:00
|
|
|
*/
|
2016-06-15 18:43:10 +12:00
|
|
|
void SchematicSceneViewer::mousePressEvent(QMouseEvent *me) {
|
2018-08-08 15:40:26 +12:00
|
|
|
// qDebug() << "[mousePressEvent]";
|
2018-07-22 18:42:19 +12:00
|
|
|
if (m_gestureActive && m_touchDevice == QTouchDevice::TouchScreen &&
|
|
|
|
!m_stylusUsed) {
|
2018-07-20 22:15:22 +12:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
m_buttonState = me->button();
|
2018-07-31 01:43:18 +12:00
|
|
|
m_oldWinPos = me->pos();
|
|
|
|
m_oldScenePos = mapToScene(m_oldWinPos);
|
2018-07-20 22:15:22 +12:00
|
|
|
|
|
|
|
if (m_buttonState == Qt::LeftButton) {
|
2021-02-24 17:48:43 +13:00
|
|
|
if (m_cursorMode == CursorMode::Hand || m_panningArmed) {
|
2019-01-18 12:20:19 +13:00
|
|
|
m_mousePanPoint = m_touchDevice == QTouchDevice::TouchScreen
|
2022-02-28 11:18:09 +13:00
|
|
|
? mapToScene(me->pos())
|
|
|
|
: me->pos() * getDevicePixelRatio(this);
|
2019-01-07 20:10:07 +13:00
|
|
|
m_panning = true;
|
2018-07-20 22:15:22 +12:00
|
|
|
return;
|
2021-02-24 17:48:43 +13:00
|
|
|
} else if (m_cursorMode == CursorMode::Zoom) {
|
|
|
|
m_zoomPoint = me->pos();
|
|
|
|
m_zooming = true;
|
|
|
|
return;
|
2018-07-20 22:15:22 +12:00
|
|
|
}
|
2018-07-31 01:43:18 +12:00
|
|
|
} else if (m_buttonState == Qt::MidButton) {
|
2019-01-18 12:20:19 +13:00
|
|
|
m_mousePanPoint = m_touchDevice == QTouchDevice::TouchScreen
|
2019-01-07 20:10:07 +13:00
|
|
|
? mapToScene(me->pos())
|
2022-02-28 11:18:09 +13:00
|
|
|
: me->pos() * getDevicePixelRatio(this);
|
2018-07-20 22:15:22 +12:00
|
|
|
}
|
2016-06-15 18:43:10 +12:00
|
|
|
bool drawRect = true;
|
|
|
|
QList<QGraphicsItem *> pointedItems = items(me->pos());
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < pointedItems.size(); i++) {
|
|
|
|
SchematicWindowEditor *editor =
|
|
|
|
dynamic_cast<SchematicWindowEditor *>(pointedItems[i]);
|
|
|
|
if (!editor) {
|
|
|
|
drawRect = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
if (m_buttonState == Qt::LeftButton && drawRect)
|
|
|
|
setDragMode(QGraphicsView::RubberBandDrag);
|
|
|
|
QGraphicsView::mousePressEvent(me);
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
/*! Reimplemets the QGraphicsView::mouseMoveEvent()
|
2019-08-05 20:37:40 +12:00
|
|
|
*/
|
2016-06-15 18:43:10 +12:00
|
|
|
void SchematicSceneViewer::mouseMoveEvent(QMouseEvent *me) {
|
2018-07-22 18:42:19 +12:00
|
|
|
if (m_gestureActive && m_touchDevice == QTouchDevice::TouchScreen &&
|
|
|
|
!m_stylusUsed) {
|
2018-07-20 22:15:22 +12:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
QPoint currWinPos = me->pos();
|
|
|
|
QPointF currScenePos = mapToScene(currWinPos);
|
2020-06-15 20:27:26 +12:00
|
|
|
if (((m_cursorMode == CursorMode::Hand || m_panningArmed) && m_panning) ||
|
2018-07-20 22:15:22 +12:00
|
|
|
m_buttonState == Qt::MidButton) {
|
2019-01-10 14:26:28 +13:00
|
|
|
QPointF usePos = m_touchDevice == QTouchDevice::TouchScreen
|
2019-01-14 07:47:35 +13:00
|
|
|
? mapToScene(me->pos())
|
2022-02-28 11:18:09 +13:00
|
|
|
: me->pos() * getDevicePixelRatio(this);
|
2019-01-18 12:20:19 +13:00
|
|
|
QPointF deltaPoint = usePos - m_mousePanPoint;
|
2018-07-31 01:43:18 +12:00
|
|
|
panQt(deltaPoint);
|
2019-01-18 12:20:19 +13:00
|
|
|
m_mousePanPoint = m_touchDevice == QTouchDevice::TouchScreen
|
2019-01-10 18:16:26 +13:00
|
|
|
? mapToScene(me->pos())
|
2022-02-28 11:18:09 +13:00
|
|
|
: me->pos() * getDevicePixelRatio(this);
|
2018-07-20 22:15:22 +12:00
|
|
|
} else {
|
2018-07-31 01:43:18 +12:00
|
|
|
if (m_cursorMode == CursorMode::Zoom && m_zooming) {
|
|
|
|
int deltaY = (m_oldWinPos.y() - me->pos().y()) * 10;
|
|
|
|
double factorY = exp(deltaY * 0.001);
|
2019-01-10 14:26:28 +13:00
|
|
|
changeScale(m_zoomPoint, factorY);
|
2019-01-18 12:20:19 +13:00
|
|
|
m_panning = false;
|
2018-07-31 01:43:18 +12:00
|
|
|
}
|
2018-07-20 22:15:22 +12:00
|
|
|
m_oldWinPos = currWinPos;
|
|
|
|
m_oldScenePos = currScenePos;
|
2016-06-15 18:43:10 +12:00
|
|
|
}
|
|
|
|
QGraphicsView::mouseMoveEvent(me);
|
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
|
|
|
/*! Reimplemets the QGraphicsView::mouseReleaseEvent()
|
2019-08-05 20:37:40 +12:00
|
|
|
*/
|
2016-06-15 18:43:10 +12:00
|
|
|
void SchematicSceneViewer::mouseReleaseEvent(QMouseEvent *me) {
|
2018-08-08 15:40:26 +12:00
|
|
|
// qDebug() << "[mouseReleaseEvent]";
|
2018-08-02 00:06:45 +12:00
|
|
|
m_gestureActive = false;
|
|
|
|
m_zooming = false;
|
|
|
|
m_panning = false;
|
|
|
|
m_stylusUsed = false;
|
|
|
|
m_scaleFactor = 0.0;
|
2018-07-20 22:15:22 +12:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
m_buttonState = Qt::NoButton;
|
|
|
|
QGraphicsView::mouseReleaseEvent(me);
|
|
|
|
setDragMode(QGraphicsView::NoDrag);
|
|
|
|
// update();
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2018-07-20 22:15:22 +12:00
|
|
|
void SchematicSceneViewer::mouseDoubleClickEvent(QMouseEvent *event) {
|
2018-08-08 15:40:26 +12:00
|
|
|
// qDebug() << "[mouseDoubleClickEvent]";
|
2018-07-22 18:42:19 +12:00
|
|
|
if (m_gestureActive && !m_stylusUsed) {
|
2018-07-20 22:15:22 +12:00
|
|
|
m_gestureActive = false;
|
2018-08-02 00:06:45 +12:00
|
|
|
QGraphicsItem *item =
|
|
|
|
scene()->itemAt(mapToScene(event->pos()), QTransform());
|
|
|
|
if (!item) {
|
|
|
|
fitScene();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
mousePressEvent(event);
|
2018-07-20 22:15:22 +12:00
|
|
|
}
|
2018-07-22 18:37:49 +12:00
|
|
|
|
2018-07-20 22:15:22 +12:00
|
|
|
QGraphicsView::mouseDoubleClickEvent(event);
|
|
|
|
}
|
2018-08-02 00:06:45 +12:00
|
|
|
|
2018-07-20 22:15:22 +12:00
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
void SchematicSceneViewer::keyPressEvent(QKeyEvent *ke) {
|
|
|
|
ke->ignore();
|
|
|
|
QGraphicsView::keyPressEvent(ke);
|
|
|
|
if (!ke->isAccepted()) SchematicZoomer(this).exec(ke);
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2020-06-15 20:27:26 +12:00
|
|
|
void SchematicSceneViewer::keyReleaseEvent(QKeyEvent *ke) {
|
|
|
|
QGraphicsView::keyReleaseEvent(ke);
|
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
/*! Reimplemets the QGraphicsView::wheelEvent()
|
2019-08-05 20:37:40 +12:00
|
|
|
*/
|
2016-06-15 18:43:10 +12:00
|
|
|
void SchematicSceneViewer::wheelEvent(QWheelEvent *me) {
|
2018-08-08 15:40:26 +12:00
|
|
|
// qDebug() << "[wheelEvent]";
|
|
|
|
|
|
|
|
int delta = 0;
|
|
|
|
switch (me->source()) {
|
|
|
|
case Qt::MouseEventNotSynthesized: {
|
|
|
|
if (me->modifiers() & Qt::AltModifier)
|
|
|
|
delta = me->angleDelta().x();
|
|
|
|
else
|
|
|
|
delta = me->angleDelta().y();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case Qt::MouseEventSynthesizedBySystem: {
|
|
|
|
QPoint numPixels = me->pixelDelta();
|
|
|
|
QPoint numDegrees = me->angleDelta() / 8;
|
|
|
|
if (!numPixels.isNull()) {
|
|
|
|
delta = me->pixelDelta().y();
|
|
|
|
} else if (!numDegrees.isNull()) {
|
|
|
|
QPoint numSteps = numDegrees / 15;
|
|
|
|
delta = numSteps.y();
|
|
|
|
}
|
|
|
|
break;
|
2018-07-22 18:37:49 +12:00
|
|
|
}
|
2018-08-08 15:40:26 +12:00
|
|
|
|
|
|
|
default: // Qt::MouseEventSynthesizedByQt,
|
|
|
|
// Qt::MouseEventSynthesizedByApplication
|
2020-04-17 19:02:53 +12:00
|
|
|
{
|
|
|
|
std::cout << "not supported event: Qt::MouseEventSynthesizedByQt, "
|
|
|
|
"Qt::MouseEventSynthesizedByApplication"
|
|
|
|
<< std::endl;
|
|
|
|
break;
|
|
|
|
}
|
2018-08-08 15:40:26 +12:00
|
|
|
|
|
|
|
} // end switch
|
|
|
|
|
|
|
|
if (abs(delta) > 0) {
|
|
|
|
if ((m_gestureActive == true &&
|
|
|
|
m_touchDevice == QTouchDevice::TouchScreen) ||
|
|
|
|
m_gestureActive == false) {
|
|
|
|
double factor = exp(delta * 0.001);
|
2019-01-11 11:44:31 +13:00
|
|
|
changeScale(me->pos(), factor);
|
2019-01-18 12:20:19 +13:00
|
|
|
m_panning = false;
|
2018-08-08 15:40:26 +12:00
|
|
|
}
|
|
|
|
}
|
|
|
|
me->accept();
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2019-08-05 20:37:40 +12:00
|
|
|
void SchematicSceneViewer::zoomQt(bool zoomin, bool resetView) {
|
|
|
|
if (resetView) {
|
|
|
|
resetMatrix();
|
2021-07-08 13:39:28 +12:00
|
|
|
// resetting will set view to the center of items bounding
|
2019-08-05 20:37:40 +12:00
|
|
|
centerOn(scene()->itemsBoundingRect().center());
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-03-19 06:57:51 +13:00
|
|
|
#if QT_VERSION >= 0x050000
|
2016-06-15 18:43:10 +12:00
|
|
|
double scale2 = matrix().determinant();
|
2016-03-19 06:57:51 +13:00
|
|
|
#else
|
2016-06-15 18:43:10 +12:00
|
|
|
double scale2 = matrix().det();
|
2016-03-19 06:57:51 +13:00
|
|
|
#endif
|
2019-08-05 20:37:40 +12:00
|
|
|
if ((scale2 < 100000 || !zoomin) && (scale2 > 0.001 * 0.05 || zoomin)) {
|
2016-06-15 18:43:10 +12:00
|
|
|
double oldZoomScale = sqrt(scale2);
|
2020-04-17 19:02:53 +12:00
|
|
|
double zoomScale =
|
|
|
|
resetView ? 1
|
|
|
|
: ImageUtils::getQuantizedZoomFactor(oldZoomScale, zoomin);
|
2016-06-15 18:43:10 +12:00
|
|
|
QMatrix scale =
|
|
|
|
QMatrix().scale(zoomScale / oldZoomScale, zoomScale / oldZoomScale);
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
// See QGraphicsView::mapToScene()'s doc for details
|
2019-08-05 20:37:40 +12:00
|
|
|
QPointF sceneCenter(mapToScene(rect().center()));
|
2016-06-15 18:43:10 +12:00
|
|
|
setMatrix(scale, true);
|
2019-08-05 20:37:40 +12:00
|
|
|
centerOn(sceneCenter);
|
2016-06-15 18:43:10 +12:00
|
|
|
}
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
|
|
|
/*! The view is scaled around the point \b winPos by \b scaleFactor;
|
2019-08-05 20:37:40 +12:00
|
|
|
*/
|
2016-06-15 18:43:10 +12:00
|
|
|
void SchematicSceneViewer::changeScale(const QPoint &winPos,
|
|
|
|
qreal scaleFactor) {
|
2019-01-18 12:20:19 +13:00
|
|
|
QPointF startScenePos = mapToScene(winPos);
|
|
|
|
QMatrix scale = QMatrix().scale(scaleFactor, scaleFactor);
|
2016-06-15 18:43:10 +12:00
|
|
|
setMatrix(scale, true);
|
2019-01-18 12:20:19 +13:00
|
|
|
QPointF endScenePos = mapToScene(winPos);
|
|
|
|
QPointF delta = endScenePos - startScenePos;
|
2016-06-15 18:43:10 +12:00
|
|
|
translate(delta.x(), delta.y());
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
void SchematicSceneViewer::fitScene() {
|
|
|
|
if (scene()) {
|
|
|
|
QRectF rect = scene()->itemsBoundingRect();
|
|
|
|
fitInView(rect, Qt::KeepAspectRatio);
|
|
|
|
}
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
void SchematicSceneViewer::centerOnCurrent() {
|
|
|
|
SchematicScene *schematicScene = dynamic_cast<SchematicScene *>(scene());
|
|
|
|
QGraphicsItem *node = schematicScene->getCurrentNode();
|
|
|
|
if (node) centerOn(node);
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
void SchematicSceneViewer::reorderScene() {
|
|
|
|
SchematicScene *schematicScene = dynamic_cast<SchematicScene *>(scene());
|
|
|
|
schematicScene->reorderScene();
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
void SchematicSceneViewer::normalizeScene() {
|
|
|
|
// See QGraphicsView::mapToScene()'s doc for details
|
2019-08-05 20:37:40 +12:00
|
|
|
QPointF sceneCenter(mapToScene(rect().center()));
|
2016-06-15 18:43:10 +12:00
|
|
|
resetMatrix();
|
2016-03-19 06:57:51 +13:00
|
|
|
#if defined(MACOSX)
|
2016-06-15 18:43:10 +12:00
|
|
|
scale(1.32, 1.32);
|
2016-03-19 06:57:51 +13:00
|
|
|
#endif
|
2019-08-05 20:37:40 +12:00
|
|
|
centerOn(sceneCenter);
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
2018-07-31 01:43:18 +12:00
|
|
|
void SchematicSceneViewer::panQt(const QPointF &delta) {
|
2019-01-18 12:20:19 +13:00
|
|
|
if (delta == QPointF()) return;
|
2018-07-20 22:15:22 +12:00
|
|
|
setInteractive(false);
|
|
|
|
// I need to disable QGraphicsView event handling to avoid the generation of
|
|
|
|
// 'virtual' mouseMoveEvent
|
2018-07-31 01:43:18 +12:00
|
|
|
translate(delta.x(), delta.y());
|
2018-07-20 22:15:22 +12:00
|
|
|
// translate has changed the matrix affecting the mapToScene() method. I
|
|
|
|
// have to recompute currScenePos
|
|
|
|
setInteractive(true);
|
|
|
|
}
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
void SchematicSceneViewer::showEvent(QShowEvent *se) {
|
|
|
|
QGraphicsView::showEvent(se);
|
|
|
|
if (m_firstShowing) {
|
|
|
|
m_firstShowing = false;
|
|
|
|
QRectF rect = scene()->itemsBoundingRect();
|
|
|
|
resetMatrix();
|
|
|
|
centerOn(rect.center());
|
|
|
|
}
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
2018-07-20 22:15:22 +12:00
|
|
|
//------------------------------------------------------------------
|
2018-07-22 18:42:19 +12:00
|
|
|
|
2018-07-26 03:30:51 +12:00
|
|
|
void SchematicSceneViewer::enterEvent(QEvent *e) {
|
2020-06-15 20:27:26 +12:00
|
|
|
m_panningArmed = false;
|
2018-07-26 03:30:51 +12:00
|
|
|
switch (m_cursorMode) {
|
|
|
|
case CursorMode::Hand:
|
|
|
|
setToolCursor(this, ToolCursor::PanCursor);
|
|
|
|
break;
|
|
|
|
case CursorMode::Zoom:
|
|
|
|
setToolCursor(this, ToolCursor::ZoomCursor);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
setToolCursor(this, ToolCursor::StrokeSelectCursor);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2020-06-15 20:27:26 +12:00
|
|
|
void SchematicSceneViewer::leaveEvent(QEvent *e) {
|
|
|
|
m_panningArmed = false;
|
|
|
|
setCursor(Qt::ArrowCursor);
|
|
|
|
}
|
2018-07-26 03:30:51 +12:00
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2018-07-22 18:42:19 +12:00
|
|
|
void SchematicSceneViewer::tabletEvent(QTabletEvent *e) {
|
2018-08-08 15:40:26 +12:00
|
|
|
// qDebug() << "[tabletEvent]";
|
2018-07-22 18:42:19 +12:00
|
|
|
if (e->type() == QTabletEvent::TabletPress) {
|
|
|
|
m_stylusUsed = e->pointerType() ? true : false;
|
|
|
|
} else if (e->type() == QTabletEvent::TabletRelease) {
|
|
|
|
m_stylusUsed = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
e->accept();
|
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
2018-07-22 18:37:49 +12:00
|
|
|
|
2018-07-20 22:15:22 +12:00
|
|
|
void SchematicSceneViewer::gestureEvent(QGestureEvent *e) {
|
2018-08-08 15:40:26 +12:00
|
|
|
// qDebug() << "[gestureEvent]";
|
2018-07-20 22:15:22 +12:00
|
|
|
m_gestureActive = false;
|
|
|
|
if (QGesture *swipe = e->gesture(Qt::SwipeGesture)) {
|
|
|
|
m_gestureActive = true;
|
|
|
|
} else if (QGesture *pan = e->gesture(Qt::PanGesture)) {
|
|
|
|
m_gestureActive = true;
|
|
|
|
}
|
|
|
|
if (QGesture *pinch = e->gesture(Qt::PinchGesture)) {
|
|
|
|
QPinchGesture *gesture = static_cast<QPinchGesture *>(pinch);
|
|
|
|
QPinchGesture::ChangeFlags changeFlags = gesture->changeFlags();
|
2018-10-25 15:14:38 +13:00
|
|
|
QPoint firstCenter = gesture->centerPoint().toPoint();
|
|
|
|
if (m_touchDevice == QTouchDevice::TouchScreen)
|
|
|
|
firstCenter = mapFromGlobal(firstCenter);
|
2018-07-20 22:15:22 +12:00
|
|
|
|
|
|
|
if (gesture->state() == Qt::GestureStarted) {
|
2018-07-31 01:43:18 +12:00
|
|
|
m_gestureActive = true;
|
2018-07-20 22:15:22 +12:00
|
|
|
} else if (gesture->state() == Qt::GestureFinished) {
|
2018-07-31 01:43:18 +12:00
|
|
|
m_gestureActive = false;
|
|
|
|
m_zooming = false;
|
|
|
|
m_scaleFactor = 0.0;
|
2018-07-20 22:15:22 +12:00
|
|
|
} else {
|
|
|
|
if (changeFlags & QPinchGesture::ScaleFactorChanged) {
|
|
|
|
double scaleFactor = gesture->scaleFactor();
|
|
|
|
// the scale factor makes for too sensitive scaling
|
|
|
|
// divide the change in half
|
|
|
|
if (scaleFactor > 1) {
|
|
|
|
double decimalValue = scaleFactor - 1;
|
|
|
|
decimalValue /= 1.5;
|
|
|
|
scaleFactor = 1 + decimalValue;
|
|
|
|
} else if (scaleFactor < 1) {
|
|
|
|
double decimalValue = 1 - scaleFactor;
|
|
|
|
decimalValue /= 1.5;
|
|
|
|
scaleFactor = 1 - decimalValue;
|
|
|
|
}
|
|
|
|
if (!m_zooming) {
|
|
|
|
double delta = scaleFactor - 1;
|
|
|
|
m_scaleFactor += delta;
|
|
|
|
if (m_scaleFactor > .2 || m_scaleFactor < -.2) {
|
|
|
|
m_zooming = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (m_zooming) {
|
2019-01-11 11:44:31 +13:00
|
|
|
changeScale(firstCenter, scaleFactor);
|
2019-01-18 12:20:19 +13:00
|
|
|
m_panning = false;
|
2018-07-20 22:15:22 +12:00
|
|
|
}
|
|
|
|
m_gestureActive = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (changeFlags & QPinchGesture::CenterPointChanged) {
|
2022-02-28 11:18:09 +13:00
|
|
|
QPointF centerDelta =
|
|
|
|
(gesture->centerPoint() * getDevicePixelRatio(this)) -
|
|
|
|
(gesture->lastCenterPoint() * getDevicePixelRatio(this));
|
2018-07-31 01:43:18 +12:00
|
|
|
if (centerDelta.manhattanLength() > 1) {
|
|
|
|
// panQt(centerDelta.toPoint());
|
2018-07-20 22:15:22 +12:00
|
|
|
}
|
|
|
|
m_gestureActive = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
e->accept();
|
|
|
|
}
|
|
|
|
|
2018-07-31 01:43:18 +12:00
|
|
|
void SchematicSceneViewer::touchEvent(QTouchEvent *e, int type) {
|
2018-08-08 15:40:26 +12:00
|
|
|
// qDebug() << "[touchEvent]";
|
2018-07-31 01:43:18 +12:00
|
|
|
if (type == QEvent::TouchBegin) {
|
|
|
|
m_touchActive = true;
|
|
|
|
m_firstPanPoint = e->touchPoints().at(0).pos();
|
|
|
|
// obtain device type
|
|
|
|
m_touchDevice = e->device()->type();
|
|
|
|
} else if (m_touchActive) {
|
|
|
|
// touchpads must have 2 finger panning for tools and navigation to be
|
|
|
|
// functional on other devices, 1 finger panning is preferred
|
|
|
|
if ((e->touchPoints().count() == 2 &&
|
|
|
|
m_touchDevice == QTouchDevice::TouchPad) ||
|
|
|
|
(e->touchPoints().count() == 1 &&
|
|
|
|
m_touchDevice == QTouchDevice::TouchScreen)) {
|
|
|
|
QTouchEvent::TouchPoint panPoint = e->touchPoints().at(0);
|
|
|
|
if (!m_panning) {
|
|
|
|
QPointF deltaPoint = panPoint.pos() - m_firstPanPoint;
|
|
|
|
// minimize accidental and jerky zooming/rotating during 2 finger
|
|
|
|
// panning
|
|
|
|
if ((deltaPoint.manhattanLength() > 100) && !m_zooming) {
|
|
|
|
m_panning = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (m_panning) {
|
2022-02-28 11:18:09 +13:00
|
|
|
QPointF curPos = m_touchDevice == QTouchDevice::TouchScreen
|
|
|
|
? mapToScene(panPoint.pos().toPoint())
|
|
|
|
: mapToScene(panPoint.pos().toPoint()) *
|
|
|
|
getDevicePixelRatio(this);
|
|
|
|
QPointF lastPos = m_touchDevice == QTouchDevice::TouchScreen
|
|
|
|
? mapToScene(panPoint.lastPos().toPoint())
|
|
|
|
: mapToScene(panPoint.lastPos().toPoint()) *
|
|
|
|
getDevicePixelRatio(this);
|
2019-01-10 14:26:28 +13:00
|
|
|
QPointF centerDelta = curPos - lastPos;
|
2018-08-01 23:41:35 +12:00
|
|
|
panQt(centerDelta);
|
2018-07-31 01:43:18 +12:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (type == QEvent::TouchEnd || type == QEvent::TouchCancel) {
|
|
|
|
m_touchActive = false;
|
|
|
|
m_panning = false;
|
|
|
|
}
|
|
|
|
e->accept();
|
|
|
|
}
|
2018-07-20 22:15:22 +12:00
|
|
|
|
|
|
|
bool SchematicSceneViewer::event(QEvent *e) {
|
2018-07-22 18:37:49 +12:00
|
|
|
/*
|
2018-08-08 15:40:26 +12:00
|
|
|
switch (e->type()) {
|
|
|
|
case QEvent::TabletPress: {
|
|
|
|
QTabletEvent *te = static_cast<QTabletEvent *>(e);
|
|
|
|
qDebug() << "[event] TabletPress: pointerType(" << te->pointerType()
|
|
|
|
<< ") device(" << te->device() << ")";
|
|
|
|
} break;
|
|
|
|
case QEvent::TabletRelease:
|
|
|
|
qDebug() << "[event] TabletRelease";
|
|
|
|
break;
|
|
|
|
case QEvent::TouchBegin:
|
|
|
|
qDebug() << "[event] TouchBegin";
|
|
|
|
break;
|
|
|
|
case QEvent::TouchEnd:
|
|
|
|
qDebug() << "[event] TouchEnd";
|
|
|
|
break;
|
|
|
|
case QEvent::TouchCancel:
|
|
|
|
qDebug() << "[event] TouchCancel";
|
|
|
|
break;
|
|
|
|
case QEvent::MouseButtonPress:
|
|
|
|
qDebug() << "[event] MouseButtonPress";
|
|
|
|
break;
|
|
|
|
case QEvent::MouseButtonDblClick:
|
|
|
|
qDebug() << "[event] MouseButtonDblClick";
|
|
|
|
break;
|
|
|
|
case QEvent::MouseButtonRelease:
|
|
|
|
qDebug() << "[event] MouseButtonRelease";
|
|
|
|
break;
|
|
|
|
case QEvent::Gesture:
|
|
|
|
qDebug() << "[event] Gesture";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2018-07-22 18:37:49 +12:00
|
|
|
*/
|
|
|
|
|
2020-04-17 19:02:53 +12:00
|
|
|
if (e->type() == QEvent::Gesture && CommandManager::instance()
|
|
|
|
->getAction(MI_TouchGestureControl)
|
|
|
|
->isChecked()) {
|
2019-01-09 19:26:17 +13:00
|
|
|
gestureEvent(static_cast<QGestureEvent *>(e));
|
|
|
|
return true;
|
|
|
|
}
|
2019-01-18 12:20:19 +13:00
|
|
|
if ((e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchEnd ||
|
|
|
|
e->type() == QEvent::TouchCancel || e->type() == QEvent::TouchUpdate) &&
|
|
|
|
CommandManager::instance()
|
|
|
|
->getAction(MI_TouchGestureControl)
|
|
|
|
->isChecked()) {
|
2019-01-09 19:26:17 +13:00
|
|
|
touchEvent(static_cast<QTouchEvent *>(e), e->type());
|
|
|
|
m_gestureActive = true;
|
|
|
|
return true;
|
2018-07-20 22:15:22 +12:00
|
|
|
}
|
2021-02-14 19:09:25 +13:00
|
|
|
|
|
|
|
if (e->type() != QEvent::KeyPress && e->type() != QEvent::ShortcutOverride &&
|
|
|
|
e->type() != QEvent::KeyRelease)
|
|
|
|
return QGraphicsView::event(e);
|
|
|
|
|
|
|
|
QKeyEvent *keyEvent = static_cast<QKeyEvent *>(e);
|
|
|
|
|
|
|
|
std::string keyStr = QKeySequence(keyEvent->key() + keyEvent->modifiers())
|
|
|
|
.toString()
|
|
|
|
.toStdString();
|
|
|
|
QAction *action = CommandManager::instance()->getActionFromShortcut(keyStr);
|
|
|
|
std::string actionId = CommandManager::instance()->getIdFromAction(action);
|
|
|
|
|
|
|
|
if (actionId != T_Hand) return QGraphicsView::event(e);
|
|
|
|
|
|
|
|
if (e->type() == QEvent::KeyPress || e->type() == QEvent::ShortcutOverride) {
|
|
|
|
m_panningArmed = true;
|
2021-02-24 17:48:43 +13:00
|
|
|
action->setEnabled(false);
|
2021-02-18 05:12:52 +13:00
|
|
|
setToolCursor(this, ToolCursor::PanCursor);
|
2021-02-14 19:09:25 +13:00
|
|
|
e->accept();
|
|
|
|
return true;
|
|
|
|
} else if (e->type() == QEvent::KeyRelease) {
|
|
|
|
if (!keyEvent->isAutoRepeat()) m_panningArmed = false;
|
2021-02-24 17:48:43 +13:00
|
|
|
action->setEnabled(true);
|
2021-02-18 05:12:52 +13:00
|
|
|
switch (m_cursorMode) {
|
|
|
|
case CursorMode::Hand:
|
|
|
|
setToolCursor(this, ToolCursor::PanCursor);
|
|
|
|
break;
|
|
|
|
case CursorMode::Zoom:
|
|
|
|
setToolCursor(this, ToolCursor::ZoomCursor);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
setToolCursor(this, ToolCursor::StrokeSelectCursor);
|
|
|
|
break;
|
|
|
|
}
|
2021-02-14 19:09:25 +13:00
|
|
|
e->accept();
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2018-07-20 22:15:22 +12:00
|
|
|
return QGraphicsView::event(e);
|
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
|
|
|
void SchematicSceneViewer::setCursorMode(CursorMode cursorMode) {
|
|
|
|
m_cursorMode = cursorMode;
|
|
|
|
}
|
|
|
|
|
2016-03-19 06:57:51 +13:00
|
|
|
//==================================================================
|
|
|
|
//
|
|
|
|
// SchematicViewer
|
|
|
|
//
|
|
|
|
//==================================================================
|
|
|
|
|
|
|
|
SchematicViewer::SchematicViewer(QWidget *parent)
|
2016-06-15 18:43:10 +12:00
|
|
|
: QWidget(parent)
|
|
|
|
, m_fullSchematic(true)
|
|
|
|
, m_maximizedNode(false)
|
2018-07-20 22:15:22 +12:00
|
|
|
, m_sceneHandle(0)
|
|
|
|
, m_cursorMode(CursorMode::Select) {
|
2016-06-15 18:43:10 +12:00
|
|
|
m_viewer = new SchematicSceneViewer(this);
|
|
|
|
m_stageScene = new StageSchematicScene(this);
|
|
|
|
m_fxScene = new FxSchematicScene(this);
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
m_commonToolbar = new QToolBar(m_viewer);
|
|
|
|
m_stageToolbar = new QToolBar(m_viewer);
|
|
|
|
m_fxToolbar = new QToolBar(m_viewer);
|
|
|
|
m_swapToolbar = new QToolBar(m_viewer);
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2017-06-26 14:43:02 +12:00
|
|
|
m_commonToolbar->setObjectName("MediumPaddingToolBar");
|
|
|
|
m_stageToolbar->setObjectName("MediumPaddingToolBar");
|
|
|
|
m_fxToolbar->setObjectName("MediumPaddingToolBar");
|
|
|
|
m_swapToolbar->setObjectName("MediumPaddingToolBar");
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
createToolbars();
|
|
|
|
createActions();
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
// layout
|
|
|
|
QVBoxLayout *mainLayout = new QVBoxLayout();
|
2017-03-15 17:16:21 +13:00
|
|
|
mainLayout->setMargin(0);
|
2016-06-15 18:43:10 +12:00
|
|
|
mainLayout->setSpacing(0);
|
|
|
|
{
|
|
|
|
mainLayout->addWidget(m_viewer, 1);
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
QFrame *bottomFrame = new QFrame(this);
|
|
|
|
bottomFrame->setObjectName("SchematicBottomFrame");
|
|
|
|
QHBoxLayout *horizontalLayout = new QHBoxLayout();
|
|
|
|
horizontalLayout->setMargin(0);
|
|
|
|
horizontalLayout->setSpacing(0);
|
|
|
|
{
|
|
|
|
horizontalLayout->addWidget(m_commonToolbar);
|
|
|
|
horizontalLayout->addStretch();
|
|
|
|
horizontalLayout->addWidget(m_fxToolbar);
|
|
|
|
horizontalLayout->addWidget(m_stageToolbar);
|
|
|
|
horizontalLayout->addWidget(m_swapToolbar);
|
|
|
|
}
|
|
|
|
bottomFrame->setLayout(horizontalLayout);
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
mainLayout->addWidget(bottomFrame, 0);
|
|
|
|
}
|
|
|
|
setLayout(mainLayout);
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
connect(m_fxScene, SIGNAL(showPreview(TFxP)), this,
|
|
|
|
SIGNAL(showPreview(TFxP)));
|
|
|
|
connect(m_fxScene, SIGNAL(doCollapse(const QList<TFxP> &)), this,
|
|
|
|
SIGNAL(doCollapse(const QList<TFxP> &)));
|
|
|
|
connect(m_stageScene, SIGNAL(doCollapse(QList<TStageObjectId>)), this,
|
|
|
|
SIGNAL(doCollapse(QList<TStageObjectId>)));
|
|
|
|
connect(m_fxScene, SIGNAL(doExplodeChild(const QList<TFxP> &)), this,
|
|
|
|
SIGNAL(doExplodeChild(const QList<TFxP> &)));
|
|
|
|
connect(m_stageScene, SIGNAL(doExplodeChild(QList<TStageObjectId>)), this,
|
|
|
|
SIGNAL(doExplodeChild(QList<TStageObjectId>)));
|
|
|
|
connect(m_stageScene, SIGNAL(editObject()), this, SIGNAL(editObject()));
|
|
|
|
connect(m_fxScene, SIGNAL(editObject()), this, SIGNAL(editObject()));
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2020-04-17 19:02:53 +12:00
|
|
|
connect(m_fxScene->getFxSelection(), SIGNAL(doDelete()), this,
|
|
|
|
SLOT(deleteFxs()));
|
|
|
|
connect(m_stageScene->getStageSelection(), SIGNAL(doDelete()), this,
|
|
|
|
SLOT(deleteStageObjects()));
|
|
|
|
|
2021-03-04 20:57:24 +13:00
|
|
|
connect(m_fxScene->getFxSelection(),
|
|
|
|
SIGNAL(columnPasted(const QList<TXshColumnP> &)), this,
|
|
|
|
SIGNAL(columnPasted(const QList<TXshColumnP> &)));
|
|
|
|
connect(m_stageScene->getStageSelection(),
|
|
|
|
SIGNAL(columnPasted(const QList<TXshColumnP> &)), this,
|
|
|
|
SIGNAL(columnPasted(const QList<TXshColumnP> &)));
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
m_viewer->setScene(m_stageScene);
|
|
|
|
m_fxToolbar->hide();
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
setFocusProxy(m_viewer);
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
SchematicViewer::~SchematicViewer() {}
|
2016-03-19 06:57:51 +13:00
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2018-07-24 19:52:45 +12:00
|
|
|
void SchematicViewer::getNodeColor(int ltype, QColor &nodeColor) {
|
|
|
|
switch (ltype) {
|
|
|
|
case TZI_XSHLEVEL:
|
|
|
|
case OVL_XSHLEVEL:
|
|
|
|
nodeColor = getFullcolorColumnColor();
|
|
|
|
break;
|
|
|
|
case PLI_XSHLEVEL:
|
|
|
|
nodeColor = getVectorColumnColor();
|
|
|
|
break;
|
|
|
|
case TZP_XSHLEVEL:
|
|
|
|
nodeColor = getLevelColumnColor();
|
|
|
|
break;
|
|
|
|
case ZERARYFX_XSHLEVEL:
|
|
|
|
nodeColor = getFxColumnColor();
|
|
|
|
break;
|
|
|
|
case CHILD_XSHLEVEL:
|
|
|
|
nodeColor = getChildColumnColor();
|
|
|
|
break;
|
|
|
|
case MESH_XSHLEVEL:
|
|
|
|
nodeColor = getMeshColumnColor();
|
|
|
|
break;
|
|
|
|
case PLT_XSHLEVEL:
|
|
|
|
nodeColor = getPaletteColumnColor();
|
|
|
|
break;
|
|
|
|
case eNormalFx:
|
|
|
|
nodeColor = getNormalFxColor();
|
|
|
|
break;
|
|
|
|
case eZeraryFx:
|
|
|
|
nodeColor = getFxColumnColor();
|
|
|
|
break;
|
|
|
|
case eMacroFx:
|
|
|
|
nodeColor = getMacroFxColor();
|
|
|
|
break;
|
|
|
|
case eGroupedFx:
|
|
|
|
nodeColor = getGroupColor();
|
|
|
|
break;
|
|
|
|
case eNormalImageAdjustFx:
|
|
|
|
nodeColor = getImageAdjustFxColor();
|
|
|
|
break;
|
|
|
|
case eNormalLayerBlendingFx:
|
|
|
|
nodeColor = getLayerBlendingFxColor();
|
|
|
|
break;
|
|
|
|
case eNormalMatteFx:
|
|
|
|
nodeColor = getMatteFxColor();
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
nodeColor = grey210;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
void SchematicViewer::setApplication(TApplication *app) {
|
|
|
|
m_stageScene->setXsheetHandle(app->getCurrentXsheet());
|
|
|
|
m_stageScene->setObjectHandle(app->getCurrentObject());
|
|
|
|
m_stageScene->setFxHandle(app->getCurrentFx());
|
|
|
|
m_stageScene->setColumnHandle(app->getCurrentColumn());
|
|
|
|
m_stageScene->setSceneHandle(app->getCurrentScene());
|
|
|
|
m_stageScene->setFrameHandle(app->getCurrentFrame());
|
|
|
|
|
|
|
|
m_fxScene->setApplication(app);
|
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
|
|
|
void SchematicViewer::updateSchematic() {
|
|
|
|
m_stageScene->updateScene();
|
|
|
|
m_fxScene->updateScene();
|
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
|
|
|
void SchematicViewer::setSchematicScene(SchematicScene *scene) {
|
|
|
|
if (scene) {
|
|
|
|
m_viewer->setScene(scene);
|
|
|
|
m_viewer->centerOn(scene->sceneRect().center());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
|
|
|
void SchematicViewer::createToolbars() {
|
|
|
|
// Initialize them
|
|
|
|
m_stageToolbar->setMovable(false);
|
UI update and Icons from Konero (#126)
* add multi arc mockup
* implement mutli arc
* add join and smooth option
* reset multiarc and arc when deactivated
* create self loop if the last point is the same as the first
* make join option in multiarc consistent with tape tool
* fix a bug where thickness don't affect mutliarc in vector level
* remove join option in geometric tool
* stop mutliarc after closing shape
* double click can also end multi arc
* fix a bug where multiArc will produce buggy stroke
* fix a bug where geometric tools is not deactivated
* add multiArc shortcut
* rewrite multiArc
* revert changes to tvectorimage
* add undo data for multiArc
* Paste as Copy Command for XSheet
* Remove unneeded code
* Bug fix
* prevent guide lines from jumping around in MultiArc
* make stroke color consistent in MultiArc
* remove color in MultiArc's undo data
* make color consistent in MultiArc with previous version
* Fix single image raster levels
* fix compilation error
* fix a bug where multiArc might generate bugged stroke
* Remove ICONV dep (#3304)
* fix crash on saving studio palette
* Move to Paste Special Menu
* Don't Set Fixed Width if Docking a Floating Panel
* Update how_to_build_win.md
New draft of pr for requested changes to windows build instructions.
* fix geometric tool multiarc smooth option
* fix level saving failure
* fix wrong warning after saving palette
* fix a bug where moving a control point while holding alt has unintended result
* fix travis-install (#3389)
* Fix assert debug crash in flipconsole.cpp
Fix crash when using the viewer controls in the console (debug)
* Redraw Audio Waveform
Fills the waveform rather than outlines it.
* Update .gitignore
* fix undo data when drawing arc and mutliarc
* fix overwriting raster drawing palette (#3387)
* mode sensitive fx settings
* Create New Style Command Button (#3394)
* Create New Style Command Button
This PR creates a new button in the pallette editor that creates a new style. Button is large and easy access for a faster and easier workflow. Original code developed by Turtletooth for Tahoma. Given permission to develop within Openoonz.
Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com>
* Update paletteviewergui.cpp
Made changes to the PR per request by Shun.
* Fixed a space within the code that wasn't suppose to be there.
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
* tahoma license (#3396)
* new style button optional
* fix loading pegbars (removing updateKeyframes)
* periodic random expression
* add fx in linear color space
this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd.
in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories.
* fractal noise iwa fx
* skip unnecessary icon invalidation
* fix frame range fill with tablet
* stop function editor to open by dbl clicking key
* Expanding the radius of the rotation handle.
This just changes when the cursor transforms into the rotation tool.
(cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39)
* fix vector img patern stroke style
* Update Stylesheets
- Support the new icon sizes
- XSheet and Timeline significantly redesigned
- Lots of margin fixes and refactoring
- Remove deprecated icons, as some icons are moved into binary
- New Light theme
* New Icons
- Redesigns almost every icon as symbolic
- Adds icons for most commands
* Add Option for Icon Themes
- Adds option for icon themes
- Removes useless label from Preferences category list
* Update Icon Functions
- Adds themePath() boolean
- Adds function for recoloring black pixels in pixmaps to any color
- Rebuilds createQIcon to use fromTheme() and recolorPixmap()
- Removes createQIconOnOff as it seemed to be a rarely used duplicate of createQIcon
- Removes a grey horizontal line drawn above the console play bar in the viewer
* Set Default Icon Theme and Paths
- Sets search paths for icons for use with QIcon::fromTheme()
- Sets default start icon theme on first install
- Sets flag for displaying icons in menus, so we can selectively hide them
* Set Icons for Commands
- Sets icons for the commands
- Hides icons being displayed in menus as most icons are 20x20, they will look blurry when shrunk to 16x16
- Selectively allows icons to display for Tools in menus
* Change Icon Sizes, General Fixes and Stylesheet Additions
- Change icon sizes to new size
- Remove margin around FX Editor window
- Remove white line under color sliders in Style Editor
- Make keyframe icons uniform and color stylable in the stylesheets
- Removes deprecated stylesheet strings
- Redesign GUI for palette list view
- Make tree list header sort row stylable
- Remove black lines from scrollbars in New Project window
- Remove margin around combobox in Level Strip
- Alter how some lines are drawn in the Timeline to fix some alpha issues
- Make conditional fixed onion skin and normal onion skin dots contrast more against a light background area to make sure they have good visibility
- Make text always viewable in the FPS field in console bar
- Increase size of radio buttons in Cleanup Settings
- Increase size of switches in motion path nodes
- Remove unessesary "Layer" label in Timeline and other rects
- Various colors made stylable in the stylesheets; palette numpad and selection frame, cleanup settings border, scene cast folder path, schematic lines, ruler, xsheet lines, keyframes, cell input box and more
- Moves some external stylesheet icons into binary
* Make TPanelTitleBar Icon States Stylable
- Makes icon states for TPanelTitleBar buttons stylable in stylesheets
* Travis Fixes
* Swap Startup Popup Logos
They were in the wrong folders
* Revert "Swap Startup Popup Logos"
This reverts commit 815908a9f3e725f48507dab8a2270bdfa045649d.
* Fix Startup Popup Logo
It wasn't switching
* Feedback Changes
- Change render visualization to clapboard
- Fix text contrast on levels in XSheet
* Make Cell Selection More Clear
* Darken Light Theme and Tint Empty Cell Selection
* Fix missing icons
* Fix memo button
* Bring back colors
* Hide Motion Tab
* Fix Play Range Area (Light)
Make play range area more visible
* Vector Column Color
Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
Co-authored-by: Kite <konero@users.noreply.github.com>
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
2020-09-01 06:51:22 +12:00
|
|
|
m_stageToolbar->setIconSize(QSize(20, 20));
|
2016-06-15 18:43:10 +12:00
|
|
|
m_stageToolbar->setLayoutDirection(Qt::RightToLeft);
|
|
|
|
m_stageToolbar->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
|
|
|
|
|
|
|
|
m_commonToolbar->setMovable(false);
|
UI update and Icons from Konero (#126)
* add multi arc mockup
* implement mutli arc
* add join and smooth option
* reset multiarc and arc when deactivated
* create self loop if the last point is the same as the first
* make join option in multiarc consistent with tape tool
* fix a bug where thickness don't affect mutliarc in vector level
* remove join option in geometric tool
* stop mutliarc after closing shape
* double click can also end multi arc
* fix a bug where multiArc will produce buggy stroke
* fix a bug where geometric tools is not deactivated
* add multiArc shortcut
* rewrite multiArc
* revert changes to tvectorimage
* add undo data for multiArc
* Paste as Copy Command for XSheet
* Remove unneeded code
* Bug fix
* prevent guide lines from jumping around in MultiArc
* make stroke color consistent in MultiArc
* remove color in MultiArc's undo data
* make color consistent in MultiArc with previous version
* Fix single image raster levels
* fix compilation error
* fix a bug where multiArc might generate bugged stroke
* Remove ICONV dep (#3304)
* fix crash on saving studio palette
* Move to Paste Special Menu
* Don't Set Fixed Width if Docking a Floating Panel
* Update how_to_build_win.md
New draft of pr for requested changes to windows build instructions.
* fix geometric tool multiarc smooth option
* fix level saving failure
* fix wrong warning after saving palette
* fix a bug where moving a control point while holding alt has unintended result
* fix travis-install (#3389)
* Fix assert debug crash in flipconsole.cpp
Fix crash when using the viewer controls in the console (debug)
* Redraw Audio Waveform
Fills the waveform rather than outlines it.
* Update .gitignore
* fix undo data when drawing arc and mutliarc
* fix overwriting raster drawing palette (#3387)
* mode sensitive fx settings
* Create New Style Command Button (#3394)
* Create New Style Command Button
This PR creates a new button in the pallette editor that creates a new style. Button is large and easy access for a faster and easier workflow. Original code developed by Turtletooth for Tahoma. Given permission to develop within Openoonz.
Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com>
* Update paletteviewergui.cpp
Made changes to the PR per request by Shun.
* Fixed a space within the code that wasn't suppose to be there.
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
* tahoma license (#3396)
* new style button optional
* fix loading pegbars (removing updateKeyframes)
* periodic random expression
* add fx in linear color space
this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd.
in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories.
* fractal noise iwa fx
* skip unnecessary icon invalidation
* fix frame range fill with tablet
* stop function editor to open by dbl clicking key
* Expanding the radius of the rotation handle.
This just changes when the cursor transforms into the rotation tool.
(cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39)
* fix vector img patern stroke style
* Update Stylesheets
- Support the new icon sizes
- XSheet and Timeline significantly redesigned
- Lots of margin fixes and refactoring
- Remove deprecated icons, as some icons are moved into binary
- New Light theme
* New Icons
- Redesigns almost every icon as symbolic
- Adds icons for most commands
* Add Option for Icon Themes
- Adds option for icon themes
- Removes useless label from Preferences category list
* Update Icon Functions
- Adds themePath() boolean
- Adds function for recoloring black pixels in pixmaps to any color
- Rebuilds createQIcon to use fromTheme() and recolorPixmap()
- Removes createQIconOnOff as it seemed to be a rarely used duplicate of createQIcon
- Removes a grey horizontal line drawn above the console play bar in the viewer
* Set Default Icon Theme and Paths
- Sets search paths for icons for use with QIcon::fromTheme()
- Sets default start icon theme on first install
- Sets flag for displaying icons in menus, so we can selectively hide them
* Set Icons for Commands
- Sets icons for the commands
- Hides icons being displayed in menus as most icons are 20x20, they will look blurry when shrunk to 16x16
- Selectively allows icons to display for Tools in menus
* Change Icon Sizes, General Fixes and Stylesheet Additions
- Change icon sizes to new size
- Remove margin around FX Editor window
- Remove white line under color sliders in Style Editor
- Make keyframe icons uniform and color stylable in the stylesheets
- Removes deprecated stylesheet strings
- Redesign GUI for palette list view
- Make tree list header sort row stylable
- Remove black lines from scrollbars in New Project window
- Remove margin around combobox in Level Strip
- Alter how some lines are drawn in the Timeline to fix some alpha issues
- Make conditional fixed onion skin and normal onion skin dots contrast more against a light background area to make sure they have good visibility
- Make text always viewable in the FPS field in console bar
- Increase size of radio buttons in Cleanup Settings
- Increase size of switches in motion path nodes
- Remove unessesary "Layer" label in Timeline and other rects
- Various colors made stylable in the stylesheets; palette numpad and selection frame, cleanup settings border, scene cast folder path, schematic lines, ruler, xsheet lines, keyframes, cell input box and more
- Moves some external stylesheet icons into binary
* Make TPanelTitleBar Icon States Stylable
- Makes icon states for TPanelTitleBar buttons stylable in stylesheets
* Travis Fixes
* Swap Startup Popup Logos
They were in the wrong folders
* Revert "Swap Startup Popup Logos"
This reverts commit 815908a9f3e725f48507dab8a2270bdfa045649d.
* Fix Startup Popup Logo
It wasn't switching
* Feedback Changes
- Change render visualization to clapboard
- Fix text contrast on levels in XSheet
* Make Cell Selection More Clear
* Darken Light Theme and Tint Empty Cell Selection
* Fix missing icons
* Fix memo button
* Bring back colors
* Hide Motion Tab
* Fix Play Range Area (Light)
Make play range area more visible
* Vector Column Color
Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
Co-authored-by: Kite <konero@users.noreply.github.com>
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
2020-09-01 06:51:22 +12:00
|
|
|
m_commonToolbar->setIconSize(QSize(20, 20));
|
2016-06-15 18:43:10 +12:00
|
|
|
m_commonToolbar->setLayoutDirection(Qt::RightToLeft);
|
|
|
|
m_commonToolbar->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
|
|
|
|
|
|
|
|
m_fxToolbar->setMovable(false);
|
UI update and Icons from Konero (#126)
* add multi arc mockup
* implement mutli arc
* add join and smooth option
* reset multiarc and arc when deactivated
* create self loop if the last point is the same as the first
* make join option in multiarc consistent with tape tool
* fix a bug where thickness don't affect mutliarc in vector level
* remove join option in geometric tool
* stop mutliarc after closing shape
* double click can also end multi arc
* fix a bug where multiArc will produce buggy stroke
* fix a bug where geometric tools is not deactivated
* add multiArc shortcut
* rewrite multiArc
* revert changes to tvectorimage
* add undo data for multiArc
* Paste as Copy Command for XSheet
* Remove unneeded code
* Bug fix
* prevent guide lines from jumping around in MultiArc
* make stroke color consistent in MultiArc
* remove color in MultiArc's undo data
* make color consistent in MultiArc with previous version
* Fix single image raster levels
* fix compilation error
* fix a bug where multiArc might generate bugged stroke
* Remove ICONV dep (#3304)
* fix crash on saving studio palette
* Move to Paste Special Menu
* Don't Set Fixed Width if Docking a Floating Panel
* Update how_to_build_win.md
New draft of pr for requested changes to windows build instructions.
* fix geometric tool multiarc smooth option
* fix level saving failure
* fix wrong warning after saving palette
* fix a bug where moving a control point while holding alt has unintended result
* fix travis-install (#3389)
* Fix assert debug crash in flipconsole.cpp
Fix crash when using the viewer controls in the console (debug)
* Redraw Audio Waveform
Fills the waveform rather than outlines it.
* Update .gitignore
* fix undo data when drawing arc and mutliarc
* fix overwriting raster drawing palette (#3387)
* mode sensitive fx settings
* Create New Style Command Button (#3394)
* Create New Style Command Button
This PR creates a new button in the pallette editor that creates a new style. Button is large and easy access for a faster and easier workflow. Original code developed by Turtletooth for Tahoma. Given permission to develop within Openoonz.
Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com>
* Update paletteviewergui.cpp
Made changes to the PR per request by Shun.
* Fixed a space within the code that wasn't suppose to be there.
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
* tahoma license (#3396)
* new style button optional
* fix loading pegbars (removing updateKeyframes)
* periodic random expression
* add fx in linear color space
this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd.
in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories.
* fractal noise iwa fx
* skip unnecessary icon invalidation
* fix frame range fill with tablet
* stop function editor to open by dbl clicking key
* Expanding the radius of the rotation handle.
This just changes when the cursor transforms into the rotation tool.
(cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39)
* fix vector img patern stroke style
* Update Stylesheets
- Support the new icon sizes
- XSheet and Timeline significantly redesigned
- Lots of margin fixes and refactoring
- Remove deprecated icons, as some icons are moved into binary
- New Light theme
* New Icons
- Redesigns almost every icon as symbolic
- Adds icons for most commands
* Add Option for Icon Themes
- Adds option for icon themes
- Removes useless label from Preferences category list
* Update Icon Functions
- Adds themePath() boolean
- Adds function for recoloring black pixels in pixmaps to any color
- Rebuilds createQIcon to use fromTheme() and recolorPixmap()
- Removes createQIconOnOff as it seemed to be a rarely used duplicate of createQIcon
- Removes a grey horizontal line drawn above the console play bar in the viewer
* Set Default Icon Theme and Paths
- Sets search paths for icons for use with QIcon::fromTheme()
- Sets default start icon theme on first install
- Sets flag for displaying icons in menus, so we can selectively hide them
* Set Icons for Commands
- Sets icons for the commands
- Hides icons being displayed in menus as most icons are 20x20, they will look blurry when shrunk to 16x16
- Selectively allows icons to display for Tools in menus
* Change Icon Sizes, General Fixes and Stylesheet Additions
- Change icon sizes to new size
- Remove margin around FX Editor window
- Remove white line under color sliders in Style Editor
- Make keyframe icons uniform and color stylable in the stylesheets
- Removes deprecated stylesheet strings
- Redesign GUI for palette list view
- Make tree list header sort row stylable
- Remove black lines from scrollbars in New Project window
- Remove margin around combobox in Level Strip
- Alter how some lines are drawn in the Timeline to fix some alpha issues
- Make conditional fixed onion skin and normal onion skin dots contrast more against a light background area to make sure they have good visibility
- Make text always viewable in the FPS field in console bar
- Increase size of radio buttons in Cleanup Settings
- Increase size of switches in motion path nodes
- Remove unessesary "Layer" label in Timeline and other rects
- Various colors made stylable in the stylesheets; palette numpad and selection frame, cleanup settings border, scene cast folder path, schematic lines, ruler, xsheet lines, keyframes, cell input box and more
- Moves some external stylesheet icons into binary
* Make TPanelTitleBar Icon States Stylable
- Makes icon states for TPanelTitleBar buttons stylable in stylesheets
* Travis Fixes
* Swap Startup Popup Logos
They were in the wrong folders
* Revert "Swap Startup Popup Logos"
This reverts commit 815908a9f3e725f48507dab8a2270bdfa045649d.
* Fix Startup Popup Logo
It wasn't switching
* Feedback Changes
- Change render visualization to clapboard
- Fix text contrast on levels in XSheet
* Make Cell Selection More Clear
* Darken Light Theme and Tint Empty Cell Selection
* Fix missing icons
* Fix memo button
* Bring back colors
* Hide Motion Tab
* Fix Play Range Area (Light)
Make play range area more visible
* Vector Column Color
Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
Co-authored-by: Kite <konero@users.noreply.github.com>
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
2020-09-01 06:51:22 +12:00
|
|
|
m_fxToolbar->setIconSize(QSize(20, 20));
|
2016-06-15 18:43:10 +12:00
|
|
|
m_fxToolbar->setLayoutDirection(Qt::RightToLeft);
|
|
|
|
m_fxToolbar->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
|
|
|
|
|
|
|
|
m_swapToolbar->setMovable(false);
|
UI update and Icons from Konero (#126)
* add multi arc mockup
* implement mutli arc
* add join and smooth option
* reset multiarc and arc when deactivated
* create self loop if the last point is the same as the first
* make join option in multiarc consistent with tape tool
* fix a bug where thickness don't affect mutliarc in vector level
* remove join option in geometric tool
* stop mutliarc after closing shape
* double click can also end multi arc
* fix a bug where multiArc will produce buggy stroke
* fix a bug where geometric tools is not deactivated
* add multiArc shortcut
* rewrite multiArc
* revert changes to tvectorimage
* add undo data for multiArc
* Paste as Copy Command for XSheet
* Remove unneeded code
* Bug fix
* prevent guide lines from jumping around in MultiArc
* make stroke color consistent in MultiArc
* remove color in MultiArc's undo data
* make color consistent in MultiArc with previous version
* Fix single image raster levels
* fix compilation error
* fix a bug where multiArc might generate bugged stroke
* Remove ICONV dep (#3304)
* fix crash on saving studio palette
* Move to Paste Special Menu
* Don't Set Fixed Width if Docking a Floating Panel
* Update how_to_build_win.md
New draft of pr for requested changes to windows build instructions.
* fix geometric tool multiarc smooth option
* fix level saving failure
* fix wrong warning after saving palette
* fix a bug where moving a control point while holding alt has unintended result
* fix travis-install (#3389)
* Fix assert debug crash in flipconsole.cpp
Fix crash when using the viewer controls in the console (debug)
* Redraw Audio Waveform
Fills the waveform rather than outlines it.
* Update .gitignore
* fix undo data when drawing arc and mutliarc
* fix overwriting raster drawing palette (#3387)
* mode sensitive fx settings
* Create New Style Command Button (#3394)
* Create New Style Command Button
This PR creates a new button in the pallette editor that creates a new style. Button is large and easy access for a faster and easier workflow. Original code developed by Turtletooth for Tahoma. Given permission to develop within Openoonz.
Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com>
* Update paletteviewergui.cpp
Made changes to the PR per request by Shun.
* Fixed a space within the code that wasn't suppose to be there.
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
* tahoma license (#3396)
* new style button optional
* fix loading pegbars (removing updateKeyframes)
* periodic random expression
* add fx in linear color space
this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd.
in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories.
* fractal noise iwa fx
* skip unnecessary icon invalidation
* fix frame range fill with tablet
* stop function editor to open by dbl clicking key
* Expanding the radius of the rotation handle.
This just changes when the cursor transforms into the rotation tool.
(cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39)
* fix vector img patern stroke style
* Update Stylesheets
- Support the new icon sizes
- XSheet and Timeline significantly redesigned
- Lots of margin fixes and refactoring
- Remove deprecated icons, as some icons are moved into binary
- New Light theme
* New Icons
- Redesigns almost every icon as symbolic
- Adds icons for most commands
* Add Option for Icon Themes
- Adds option for icon themes
- Removes useless label from Preferences category list
* Update Icon Functions
- Adds themePath() boolean
- Adds function for recoloring black pixels in pixmaps to any color
- Rebuilds createQIcon to use fromTheme() and recolorPixmap()
- Removes createQIconOnOff as it seemed to be a rarely used duplicate of createQIcon
- Removes a grey horizontal line drawn above the console play bar in the viewer
* Set Default Icon Theme and Paths
- Sets search paths for icons for use with QIcon::fromTheme()
- Sets default start icon theme on first install
- Sets flag for displaying icons in menus, so we can selectively hide them
* Set Icons for Commands
- Sets icons for the commands
- Hides icons being displayed in menus as most icons are 20x20, they will look blurry when shrunk to 16x16
- Selectively allows icons to display for Tools in menus
* Change Icon Sizes, General Fixes and Stylesheet Additions
- Change icon sizes to new size
- Remove margin around FX Editor window
- Remove white line under color sliders in Style Editor
- Make keyframe icons uniform and color stylable in the stylesheets
- Removes deprecated stylesheet strings
- Redesign GUI for palette list view
- Make tree list header sort row stylable
- Remove black lines from scrollbars in New Project window
- Remove margin around combobox in Level Strip
- Alter how some lines are drawn in the Timeline to fix some alpha issues
- Make conditional fixed onion skin and normal onion skin dots contrast more against a light background area to make sure they have good visibility
- Make text always viewable in the FPS field in console bar
- Increase size of radio buttons in Cleanup Settings
- Increase size of switches in motion path nodes
- Remove unessesary "Layer" label in Timeline and other rects
- Various colors made stylable in the stylesheets; palette numpad and selection frame, cleanup settings border, scene cast folder path, schematic lines, ruler, xsheet lines, keyframes, cell input box and more
- Moves some external stylesheet icons into binary
* Make TPanelTitleBar Icon States Stylable
- Makes icon states for TPanelTitleBar buttons stylable in stylesheets
* Travis Fixes
* Swap Startup Popup Logos
They were in the wrong folders
* Revert "Swap Startup Popup Logos"
This reverts commit 815908a9f3e725f48507dab8a2270bdfa045649d.
* Fix Startup Popup Logo
It wasn't switching
* Feedback Changes
- Change render visualization to clapboard
- Fix text contrast on levels in XSheet
* Make Cell Selection More Clear
* Darken Light Theme and Tint Empty Cell Selection
* Fix missing icons
* Fix memo button
* Bring back colors
* Hide Motion Tab
* Fix Play Range Area (Light)
Make play range area more visible
* Vector Column Color
Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
Co-authored-by: Kite <konero@users.noreply.github.com>
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
2020-09-01 06:51:22 +12:00
|
|
|
m_swapToolbar->setIconSize(QSize(20, 20));
|
2016-06-15 18:43:10 +12:00
|
|
|
m_swapToolbar->setLayoutDirection(Qt::RightToLeft);
|
|
|
|
m_swapToolbar->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
|
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
|
|
|
void SchematicViewer::createActions() {
|
|
|
|
// Create all actions
|
|
|
|
QAction *addPegbar = 0, *addSpline = 0, *addCamera = 0, *insertFx = 0,
|
2018-07-24 19:52:45 +12:00
|
|
|
*addOutputFx = 0, *switchPort = 0, *iconifyNodes = 0;
|
2016-06-15 18:43:10 +12:00
|
|
|
{
|
|
|
|
// Fit schematic
|
UI update and Icons from Konero (#126)
* add multi arc mockup
* implement mutli arc
* add join and smooth option
* reset multiarc and arc when deactivated
* create self loop if the last point is the same as the first
* make join option in multiarc consistent with tape tool
* fix a bug where thickness don't affect mutliarc in vector level
* remove join option in geometric tool
* stop mutliarc after closing shape
* double click can also end multi arc
* fix a bug where multiArc will produce buggy stroke
* fix a bug where geometric tools is not deactivated
* add multiArc shortcut
* rewrite multiArc
* revert changes to tvectorimage
* add undo data for multiArc
* Paste as Copy Command for XSheet
* Remove unneeded code
* Bug fix
* prevent guide lines from jumping around in MultiArc
* make stroke color consistent in MultiArc
* remove color in MultiArc's undo data
* make color consistent in MultiArc with previous version
* Fix single image raster levels
* fix compilation error
* fix a bug where multiArc might generate bugged stroke
* Remove ICONV dep (#3304)
* fix crash on saving studio palette
* Move to Paste Special Menu
* Don't Set Fixed Width if Docking a Floating Panel
* Update how_to_build_win.md
New draft of pr for requested changes to windows build instructions.
* fix geometric tool multiarc smooth option
* fix level saving failure
* fix wrong warning after saving palette
* fix a bug where moving a control point while holding alt has unintended result
* fix travis-install (#3389)
* Fix assert debug crash in flipconsole.cpp
Fix crash when using the viewer controls in the console (debug)
* Redraw Audio Waveform
Fills the waveform rather than outlines it.
* Update .gitignore
* fix undo data when drawing arc and mutliarc
* fix overwriting raster drawing palette (#3387)
* mode sensitive fx settings
* Create New Style Command Button (#3394)
* Create New Style Command Button
This PR creates a new button in the pallette editor that creates a new style. Button is large and easy access for a faster and easier workflow. Original code developed by Turtletooth for Tahoma. Given permission to develop within Openoonz.
Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com>
* Update paletteviewergui.cpp
Made changes to the PR per request by Shun.
* Fixed a space within the code that wasn't suppose to be there.
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
* tahoma license (#3396)
* new style button optional
* fix loading pegbars (removing updateKeyframes)
* periodic random expression
* add fx in linear color space
this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd.
in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories.
* fractal noise iwa fx
* skip unnecessary icon invalidation
* fix frame range fill with tablet
* stop function editor to open by dbl clicking key
* Expanding the radius of the rotation handle.
This just changes when the cursor transforms into the rotation tool.
(cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39)
* fix vector img patern stroke style
* Update Stylesheets
- Support the new icon sizes
- XSheet and Timeline significantly redesigned
- Lots of margin fixes and refactoring
- Remove deprecated icons, as some icons are moved into binary
- New Light theme
* New Icons
- Redesigns almost every icon as symbolic
- Adds icons for most commands
* Add Option for Icon Themes
- Adds option for icon themes
- Removes useless label from Preferences category list
* Update Icon Functions
- Adds themePath() boolean
- Adds function for recoloring black pixels in pixmaps to any color
- Rebuilds createQIcon to use fromTheme() and recolorPixmap()
- Removes createQIconOnOff as it seemed to be a rarely used duplicate of createQIcon
- Removes a grey horizontal line drawn above the console play bar in the viewer
* Set Default Icon Theme and Paths
- Sets search paths for icons for use with QIcon::fromTheme()
- Sets default start icon theme on first install
- Sets flag for displaying icons in menus, so we can selectively hide them
* Set Icons for Commands
- Sets icons for the commands
- Hides icons being displayed in menus as most icons are 20x20, they will look blurry when shrunk to 16x16
- Selectively allows icons to display for Tools in menus
* Change Icon Sizes, General Fixes and Stylesheet Additions
- Change icon sizes to new size
- Remove margin around FX Editor window
- Remove white line under color sliders in Style Editor
- Make keyframe icons uniform and color stylable in the stylesheets
- Removes deprecated stylesheet strings
- Redesign GUI for palette list view
- Make tree list header sort row stylable
- Remove black lines from scrollbars in New Project window
- Remove margin around combobox in Level Strip
- Alter how some lines are drawn in the Timeline to fix some alpha issues
- Make conditional fixed onion skin and normal onion skin dots contrast more against a light background area to make sure they have good visibility
- Make text always viewable in the FPS field in console bar
- Increase size of radio buttons in Cleanup Settings
- Increase size of switches in motion path nodes
- Remove unessesary "Layer" label in Timeline and other rects
- Various colors made stylable in the stylesheets; palette numpad and selection frame, cleanup settings border, scene cast folder path, schematic lines, ruler, xsheet lines, keyframes, cell input box and more
- Moves some external stylesheet icons into binary
* Make TPanelTitleBar Icon States Stylable
- Makes icon states for TPanelTitleBar buttons stylable in stylesheets
* Travis Fixes
* Swap Startup Popup Logos
They were in the wrong folders
* Revert "Swap Startup Popup Logos"
This reverts commit 815908a9f3e725f48507dab8a2270bdfa045649d.
* Fix Startup Popup Logo
It wasn't switching
* Feedback Changes
- Change render visualization to clapboard
- Fix text contrast on levels in XSheet
* Make Cell Selection More Clear
* Darken Light Theme and Tint Empty Cell Selection
* Fix missing icons
* Fix memo button
* Bring back colors
* Hide Motion Tab
* Fix Play Range Area (Light)
Make play range area more visible
* Vector Column Color
Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
Co-authored-by: Kite <konero@users.noreply.github.com>
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
2020-09-01 06:51:22 +12:00
|
|
|
QIcon fitSchematicIcon = createQIcon("fit_to_window");
|
2016-06-15 18:43:10 +12:00
|
|
|
m_fitSchematic =
|
|
|
|
new QAction(fitSchematicIcon, tr("&Fit to Window"), m_commonToolbar);
|
|
|
|
connect(m_fitSchematic, SIGNAL(triggered()), m_viewer, SLOT(fitScene()));
|
|
|
|
|
|
|
|
// Center On
|
UI update and Icons from Konero (#126)
* add multi arc mockup
* implement mutli arc
* add join and smooth option
* reset multiarc and arc when deactivated
* create self loop if the last point is the same as the first
* make join option in multiarc consistent with tape tool
* fix a bug where thickness don't affect mutliarc in vector level
* remove join option in geometric tool
* stop mutliarc after closing shape
* double click can also end multi arc
* fix a bug where multiArc will produce buggy stroke
* fix a bug where geometric tools is not deactivated
* add multiArc shortcut
* rewrite multiArc
* revert changes to tvectorimage
* add undo data for multiArc
* Paste as Copy Command for XSheet
* Remove unneeded code
* Bug fix
* prevent guide lines from jumping around in MultiArc
* make stroke color consistent in MultiArc
* remove color in MultiArc's undo data
* make color consistent in MultiArc with previous version
* Fix single image raster levels
* fix compilation error
* fix a bug where multiArc might generate bugged stroke
* Remove ICONV dep (#3304)
* fix crash on saving studio palette
* Move to Paste Special Menu
* Don't Set Fixed Width if Docking a Floating Panel
* Update how_to_build_win.md
New draft of pr for requested changes to windows build instructions.
* fix geometric tool multiarc smooth option
* fix level saving failure
* fix wrong warning after saving palette
* fix a bug where moving a control point while holding alt has unintended result
* fix travis-install (#3389)
* Fix assert debug crash in flipconsole.cpp
Fix crash when using the viewer controls in the console (debug)
* Redraw Audio Waveform
Fills the waveform rather than outlines it.
* Update .gitignore
* fix undo data when drawing arc and mutliarc
* fix overwriting raster drawing palette (#3387)
* mode sensitive fx settings
* Create New Style Command Button (#3394)
* Create New Style Command Button
This PR creates a new button in the pallette editor that creates a new style. Button is large and easy access for a faster and easier workflow. Original code developed by Turtletooth for Tahoma. Given permission to develop within Openoonz.
Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com>
* Update paletteviewergui.cpp
Made changes to the PR per request by Shun.
* Fixed a space within the code that wasn't suppose to be there.
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
* tahoma license (#3396)
* new style button optional
* fix loading pegbars (removing updateKeyframes)
* periodic random expression
* add fx in linear color space
this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd.
in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories.
* fractal noise iwa fx
* skip unnecessary icon invalidation
* fix frame range fill with tablet
* stop function editor to open by dbl clicking key
* Expanding the radius of the rotation handle.
This just changes when the cursor transforms into the rotation tool.
(cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39)
* fix vector img patern stroke style
* Update Stylesheets
- Support the new icon sizes
- XSheet and Timeline significantly redesigned
- Lots of margin fixes and refactoring
- Remove deprecated icons, as some icons are moved into binary
- New Light theme
* New Icons
- Redesigns almost every icon as symbolic
- Adds icons for most commands
* Add Option for Icon Themes
- Adds option for icon themes
- Removes useless label from Preferences category list
* Update Icon Functions
- Adds themePath() boolean
- Adds function for recoloring black pixels in pixmaps to any color
- Rebuilds createQIcon to use fromTheme() and recolorPixmap()
- Removes createQIconOnOff as it seemed to be a rarely used duplicate of createQIcon
- Removes a grey horizontal line drawn above the console play bar in the viewer
* Set Default Icon Theme and Paths
- Sets search paths for icons for use with QIcon::fromTheme()
- Sets default start icon theme on first install
- Sets flag for displaying icons in menus, so we can selectively hide them
* Set Icons for Commands
- Sets icons for the commands
- Hides icons being displayed in menus as most icons are 20x20, they will look blurry when shrunk to 16x16
- Selectively allows icons to display for Tools in menus
* Change Icon Sizes, General Fixes and Stylesheet Additions
- Change icon sizes to new size
- Remove margin around FX Editor window
- Remove white line under color sliders in Style Editor
- Make keyframe icons uniform and color stylable in the stylesheets
- Removes deprecated stylesheet strings
- Redesign GUI for palette list view
- Make tree list header sort row stylable
- Remove black lines from scrollbars in New Project window
- Remove margin around combobox in Level Strip
- Alter how some lines are drawn in the Timeline to fix some alpha issues
- Make conditional fixed onion skin and normal onion skin dots contrast more against a light background area to make sure they have good visibility
- Make text always viewable in the FPS field in console bar
- Increase size of radio buttons in Cleanup Settings
- Increase size of switches in motion path nodes
- Remove unessesary "Layer" label in Timeline and other rects
- Various colors made stylable in the stylesheets; palette numpad and selection frame, cleanup settings border, scene cast folder path, schematic lines, ruler, xsheet lines, keyframes, cell input box and more
- Moves some external stylesheet icons into binary
* Make TPanelTitleBar Icon States Stylable
- Makes icon states for TPanelTitleBar buttons stylable in stylesheets
* Travis Fixes
* Swap Startup Popup Logos
They were in the wrong folders
* Revert "Swap Startup Popup Logos"
This reverts commit 815908a9f3e725f48507dab8a2270bdfa045649d.
* Fix Startup Popup Logo
It wasn't switching
* Feedback Changes
- Change render visualization to clapboard
- Fix text contrast on levels in XSheet
* Make Cell Selection More Clear
* Darken Light Theme and Tint Empty Cell Selection
* Fix missing icons
* Fix memo button
* Bring back colors
* Hide Motion Tab
* Fix Play Range Area (Light)
Make play range area more visible
* Vector Column Color
Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
Co-authored-by: Kite <konero@users.noreply.github.com>
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
2020-09-01 06:51:22 +12:00
|
|
|
QIcon centerOnIcon = createQIcon("focus");
|
2016-06-15 18:43:10 +12:00
|
|
|
m_centerOn =
|
|
|
|
new QAction(centerOnIcon, tr("&Focus on Current"), m_commonToolbar);
|
|
|
|
connect(m_centerOn, SIGNAL(triggered()), m_viewer, SLOT(centerOnCurrent()));
|
|
|
|
|
|
|
|
// Reorder schematic
|
UI update and Icons from Konero (#126)
* add multi arc mockup
* implement mutli arc
* add join and smooth option
* reset multiarc and arc when deactivated
* create self loop if the last point is the same as the first
* make join option in multiarc consistent with tape tool
* fix a bug where thickness don't affect mutliarc in vector level
* remove join option in geometric tool
* stop mutliarc after closing shape
* double click can also end multi arc
* fix a bug where multiArc will produce buggy stroke
* fix a bug where geometric tools is not deactivated
* add multiArc shortcut
* rewrite multiArc
* revert changes to tvectorimage
* add undo data for multiArc
* Paste as Copy Command for XSheet
* Remove unneeded code
* Bug fix
* prevent guide lines from jumping around in MultiArc
* make stroke color consistent in MultiArc
* remove color in MultiArc's undo data
* make color consistent in MultiArc with previous version
* Fix single image raster levels
* fix compilation error
* fix a bug where multiArc might generate bugged stroke
* Remove ICONV dep (#3304)
* fix crash on saving studio palette
* Move to Paste Special Menu
* Don't Set Fixed Width if Docking a Floating Panel
* Update how_to_build_win.md
New draft of pr for requested changes to windows build instructions.
* fix geometric tool multiarc smooth option
* fix level saving failure
* fix wrong warning after saving palette
* fix a bug where moving a control point while holding alt has unintended result
* fix travis-install (#3389)
* Fix assert debug crash in flipconsole.cpp
Fix crash when using the viewer controls in the console (debug)
* Redraw Audio Waveform
Fills the waveform rather than outlines it.
* Update .gitignore
* fix undo data when drawing arc and mutliarc
* fix overwriting raster drawing palette (#3387)
* mode sensitive fx settings
* Create New Style Command Button (#3394)
* Create New Style Command Button
This PR creates a new button in the pallette editor that creates a new style. Button is large and easy access for a faster and easier workflow. Original code developed by Turtletooth for Tahoma. Given permission to develop within Openoonz.
Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com>
* Update paletteviewergui.cpp
Made changes to the PR per request by Shun.
* Fixed a space within the code that wasn't suppose to be there.
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
* tahoma license (#3396)
* new style button optional
* fix loading pegbars (removing updateKeyframes)
* periodic random expression
* add fx in linear color space
this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd.
in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories.
* fractal noise iwa fx
* skip unnecessary icon invalidation
* fix frame range fill with tablet
* stop function editor to open by dbl clicking key
* Expanding the radius of the rotation handle.
This just changes when the cursor transforms into the rotation tool.
(cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39)
* fix vector img patern stroke style
* Update Stylesheets
- Support the new icon sizes
- XSheet and Timeline significantly redesigned
- Lots of margin fixes and refactoring
- Remove deprecated icons, as some icons are moved into binary
- New Light theme
* New Icons
- Redesigns almost every icon as symbolic
- Adds icons for most commands
* Add Option for Icon Themes
- Adds option for icon themes
- Removes useless label from Preferences category list
* Update Icon Functions
- Adds themePath() boolean
- Adds function for recoloring black pixels in pixmaps to any color
- Rebuilds createQIcon to use fromTheme() and recolorPixmap()
- Removes createQIconOnOff as it seemed to be a rarely used duplicate of createQIcon
- Removes a grey horizontal line drawn above the console play bar in the viewer
* Set Default Icon Theme and Paths
- Sets search paths for icons for use with QIcon::fromTheme()
- Sets default start icon theme on first install
- Sets flag for displaying icons in menus, so we can selectively hide them
* Set Icons for Commands
- Sets icons for the commands
- Hides icons being displayed in menus as most icons are 20x20, they will look blurry when shrunk to 16x16
- Selectively allows icons to display for Tools in menus
* Change Icon Sizes, General Fixes and Stylesheet Additions
- Change icon sizes to new size
- Remove margin around FX Editor window
- Remove white line under color sliders in Style Editor
- Make keyframe icons uniform and color stylable in the stylesheets
- Removes deprecated stylesheet strings
- Redesign GUI for palette list view
- Make tree list header sort row stylable
- Remove black lines from scrollbars in New Project window
- Remove margin around combobox in Level Strip
- Alter how some lines are drawn in the Timeline to fix some alpha issues
- Make conditional fixed onion skin and normal onion skin dots contrast more against a light background area to make sure they have good visibility
- Make text always viewable in the FPS field in console bar
- Increase size of radio buttons in Cleanup Settings
- Increase size of switches in motion path nodes
- Remove unessesary "Layer" label in Timeline and other rects
- Various colors made stylable in the stylesheets; palette numpad and selection frame, cleanup settings border, scene cast folder path, schematic lines, ruler, xsheet lines, keyframes, cell input box and more
- Moves some external stylesheet icons into binary
* Make TPanelTitleBar Icon States Stylable
- Makes icon states for TPanelTitleBar buttons stylable in stylesheets
* Travis Fixes
* Swap Startup Popup Logos
They were in the wrong folders
* Revert "Swap Startup Popup Logos"
This reverts commit 815908a9f3e725f48507dab8a2270bdfa045649d.
* Fix Startup Popup Logo
It wasn't switching
* Feedback Changes
- Change render visualization to clapboard
- Fix text contrast on levels in XSheet
* Make Cell Selection More Clear
* Darken Light Theme and Tint Empty Cell Selection
* Fix missing icons
* Fix memo button
* Bring back colors
* Hide Motion Tab
* Fix Play Range Area (Light)
Make play range area more visible
* Vector Column Color
Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
Co-authored-by: Kite <konero@users.noreply.github.com>
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
2020-09-01 06:51:22 +12:00
|
|
|
QIcon reorderIcon = createQIcon("reorder", false);
|
2016-06-15 18:43:10 +12:00
|
|
|
m_reorder = new QAction(reorderIcon, tr("&Reorder Nodes"), m_commonToolbar);
|
|
|
|
connect(m_reorder, SIGNAL(triggered()), m_viewer, SLOT(reorderScene()));
|
|
|
|
|
|
|
|
// Normalize schematic schematic
|
UI update and Icons from Konero (#126)
* add multi arc mockup
* implement mutli arc
* add join and smooth option
* reset multiarc and arc when deactivated
* create self loop if the last point is the same as the first
* make join option in multiarc consistent with tape tool
* fix a bug where thickness don't affect mutliarc in vector level
* remove join option in geometric tool
* stop mutliarc after closing shape
* double click can also end multi arc
* fix a bug where multiArc will produce buggy stroke
* fix a bug where geometric tools is not deactivated
* add multiArc shortcut
* rewrite multiArc
* revert changes to tvectorimage
* add undo data for multiArc
* Paste as Copy Command for XSheet
* Remove unneeded code
* Bug fix
* prevent guide lines from jumping around in MultiArc
* make stroke color consistent in MultiArc
* remove color in MultiArc's undo data
* make color consistent in MultiArc with previous version
* Fix single image raster levels
* fix compilation error
* fix a bug where multiArc might generate bugged stroke
* Remove ICONV dep (#3304)
* fix crash on saving studio palette
* Move to Paste Special Menu
* Don't Set Fixed Width if Docking a Floating Panel
* Update how_to_build_win.md
New draft of pr for requested changes to windows build instructions.
* fix geometric tool multiarc smooth option
* fix level saving failure
* fix wrong warning after saving palette
* fix a bug where moving a control point while holding alt has unintended result
* fix travis-install (#3389)
* Fix assert debug crash in flipconsole.cpp
Fix crash when using the viewer controls in the console (debug)
* Redraw Audio Waveform
Fills the waveform rather than outlines it.
* Update .gitignore
* fix undo data when drawing arc and mutliarc
* fix overwriting raster drawing palette (#3387)
* mode sensitive fx settings
* Create New Style Command Button (#3394)
* Create New Style Command Button
This PR creates a new button in the pallette editor that creates a new style. Button is large and easy access for a faster and easier workflow. Original code developed by Turtletooth for Tahoma. Given permission to develop within Openoonz.
Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com>
* Update paletteviewergui.cpp
Made changes to the PR per request by Shun.
* Fixed a space within the code that wasn't suppose to be there.
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
* tahoma license (#3396)
* new style button optional
* fix loading pegbars (removing updateKeyframes)
* periodic random expression
* add fx in linear color space
this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd.
in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories.
* fractal noise iwa fx
* skip unnecessary icon invalidation
* fix frame range fill with tablet
* stop function editor to open by dbl clicking key
* Expanding the radius of the rotation handle.
This just changes when the cursor transforms into the rotation tool.
(cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39)
* fix vector img patern stroke style
* Update Stylesheets
- Support the new icon sizes
- XSheet and Timeline significantly redesigned
- Lots of margin fixes and refactoring
- Remove deprecated icons, as some icons are moved into binary
- New Light theme
* New Icons
- Redesigns almost every icon as symbolic
- Adds icons for most commands
* Add Option for Icon Themes
- Adds option for icon themes
- Removes useless label from Preferences category list
* Update Icon Functions
- Adds themePath() boolean
- Adds function for recoloring black pixels in pixmaps to any color
- Rebuilds createQIcon to use fromTheme() and recolorPixmap()
- Removes createQIconOnOff as it seemed to be a rarely used duplicate of createQIcon
- Removes a grey horizontal line drawn above the console play bar in the viewer
* Set Default Icon Theme and Paths
- Sets search paths for icons for use with QIcon::fromTheme()
- Sets default start icon theme on first install
- Sets flag for displaying icons in menus, so we can selectively hide them
* Set Icons for Commands
- Sets icons for the commands
- Hides icons being displayed in menus as most icons are 20x20, they will look blurry when shrunk to 16x16
- Selectively allows icons to display for Tools in menus
* Change Icon Sizes, General Fixes and Stylesheet Additions
- Change icon sizes to new size
- Remove margin around FX Editor window
- Remove white line under color sliders in Style Editor
- Make keyframe icons uniform and color stylable in the stylesheets
- Removes deprecated stylesheet strings
- Redesign GUI for palette list view
- Make tree list header sort row stylable
- Remove black lines from scrollbars in New Project window
- Remove margin around combobox in Level Strip
- Alter how some lines are drawn in the Timeline to fix some alpha issues
- Make conditional fixed onion skin and normal onion skin dots contrast more against a light background area to make sure they have good visibility
- Make text always viewable in the FPS field in console bar
- Increase size of radio buttons in Cleanup Settings
- Increase size of switches in motion path nodes
- Remove unessesary "Layer" label in Timeline and other rects
- Various colors made stylable in the stylesheets; palette numpad and selection frame, cleanup settings border, scene cast folder path, schematic lines, ruler, xsheet lines, keyframes, cell input box and more
- Moves some external stylesheet icons into binary
* Make TPanelTitleBar Icon States Stylable
- Makes icon states for TPanelTitleBar buttons stylable in stylesheets
* Travis Fixes
* Swap Startup Popup Logos
They were in the wrong folders
* Revert "Swap Startup Popup Logos"
This reverts commit 815908a9f3e725f48507dab8a2270bdfa045649d.
* Fix Startup Popup Logo
It wasn't switching
* Feedback Changes
- Change render visualization to clapboard
- Fix text contrast on levels in XSheet
* Make Cell Selection More Clear
* Darken Light Theme and Tint Empty Cell Selection
* Fix missing icons
* Fix memo button
* Bring back colors
* Hide Motion Tab
* Fix Play Range Area (Light)
Make play range area more visible
* Vector Column Color
Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
Co-authored-by: Kite <konero@users.noreply.github.com>
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
2020-09-01 06:51:22 +12:00
|
|
|
QIcon normalizeIcon = createQIcon("actual_pixel_size");
|
2016-06-15 18:43:10 +12:00
|
|
|
m_normalize =
|
|
|
|
new QAction(normalizeIcon, tr("&Reset Size"), m_commonToolbar);
|
|
|
|
connect(m_normalize, SIGNAL(triggered()), m_viewer, SLOT(normalizeScene()));
|
2016-03-19 06:57:51 +13:00
|
|
|
|
UI update and Icons from Konero (#126)
* add multi arc mockup
* implement mutli arc
* add join and smooth option
* reset multiarc and arc when deactivated
* create self loop if the last point is the same as the first
* make join option in multiarc consistent with tape tool
* fix a bug where thickness don't affect mutliarc in vector level
* remove join option in geometric tool
* stop mutliarc after closing shape
* double click can also end multi arc
* fix a bug where multiArc will produce buggy stroke
* fix a bug where geometric tools is not deactivated
* add multiArc shortcut
* rewrite multiArc
* revert changes to tvectorimage
* add undo data for multiArc
* Paste as Copy Command for XSheet
* Remove unneeded code
* Bug fix
* prevent guide lines from jumping around in MultiArc
* make stroke color consistent in MultiArc
* remove color in MultiArc's undo data
* make color consistent in MultiArc with previous version
* Fix single image raster levels
* fix compilation error
* fix a bug where multiArc might generate bugged stroke
* Remove ICONV dep (#3304)
* fix crash on saving studio palette
* Move to Paste Special Menu
* Don't Set Fixed Width if Docking a Floating Panel
* Update how_to_build_win.md
New draft of pr for requested changes to windows build instructions.
* fix geometric tool multiarc smooth option
* fix level saving failure
* fix wrong warning after saving palette
* fix a bug where moving a control point while holding alt has unintended result
* fix travis-install (#3389)
* Fix assert debug crash in flipconsole.cpp
Fix crash when using the viewer controls in the console (debug)
* Redraw Audio Waveform
Fills the waveform rather than outlines it.
* Update .gitignore
* fix undo data when drawing arc and mutliarc
* fix overwriting raster drawing palette (#3387)
* mode sensitive fx settings
* Create New Style Command Button (#3394)
* Create New Style Command Button
This PR creates a new button in the pallette editor that creates a new style. Button is large and easy access for a faster and easier workflow. Original code developed by Turtletooth for Tahoma. Given permission to develop within Openoonz.
Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com>
* Update paletteviewergui.cpp
Made changes to the PR per request by Shun.
* Fixed a space within the code that wasn't suppose to be there.
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
* tahoma license (#3396)
* new style button optional
* fix loading pegbars (removing updateKeyframes)
* periodic random expression
* add fx in linear color space
this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd.
in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories.
* fractal noise iwa fx
* skip unnecessary icon invalidation
* fix frame range fill with tablet
* stop function editor to open by dbl clicking key
* Expanding the radius of the rotation handle.
This just changes when the cursor transforms into the rotation tool.
(cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39)
* fix vector img patern stroke style
* Update Stylesheets
- Support the new icon sizes
- XSheet and Timeline significantly redesigned
- Lots of margin fixes and refactoring
- Remove deprecated icons, as some icons are moved into binary
- New Light theme
* New Icons
- Redesigns almost every icon as symbolic
- Adds icons for most commands
* Add Option for Icon Themes
- Adds option for icon themes
- Removes useless label from Preferences category list
* Update Icon Functions
- Adds themePath() boolean
- Adds function for recoloring black pixels in pixmaps to any color
- Rebuilds createQIcon to use fromTheme() and recolorPixmap()
- Removes createQIconOnOff as it seemed to be a rarely used duplicate of createQIcon
- Removes a grey horizontal line drawn above the console play bar in the viewer
* Set Default Icon Theme and Paths
- Sets search paths for icons for use with QIcon::fromTheme()
- Sets default start icon theme on first install
- Sets flag for displaying icons in menus, so we can selectively hide them
* Set Icons for Commands
- Sets icons for the commands
- Hides icons being displayed in menus as most icons are 20x20, they will look blurry when shrunk to 16x16
- Selectively allows icons to display for Tools in menus
* Change Icon Sizes, General Fixes and Stylesheet Additions
- Change icon sizes to new size
- Remove margin around FX Editor window
- Remove white line under color sliders in Style Editor
- Make keyframe icons uniform and color stylable in the stylesheets
- Removes deprecated stylesheet strings
- Redesign GUI for palette list view
- Make tree list header sort row stylable
- Remove black lines from scrollbars in New Project window
- Remove margin around combobox in Level Strip
- Alter how some lines are drawn in the Timeline to fix some alpha issues
- Make conditional fixed onion skin and normal onion skin dots contrast more against a light background area to make sure they have good visibility
- Make text always viewable in the FPS field in console bar
- Increase size of radio buttons in Cleanup Settings
- Increase size of switches in motion path nodes
- Remove unessesary "Layer" label in Timeline and other rects
- Various colors made stylable in the stylesheets; palette numpad and selection frame, cleanup settings border, scene cast folder path, schematic lines, ruler, xsheet lines, keyframes, cell input box and more
- Moves some external stylesheet icons into binary
* Make TPanelTitleBar Icon States Stylable
- Makes icon states for TPanelTitleBar buttons stylable in stylesheets
* Travis Fixes
* Swap Startup Popup Logos
They were in the wrong folders
* Revert "Swap Startup Popup Logos"
This reverts commit 815908a9f3e725f48507dab8a2270bdfa045649d.
* Fix Startup Popup Logo
It wasn't switching
* Feedback Changes
- Change render visualization to clapboard
- Fix text contrast on levels in XSheet
* Make Cell Selection More Clear
* Darken Light Theme and Tint Empty Cell Selection
* Fix missing icons
* Fix memo button
* Bring back colors
* Hide Motion Tab
* Fix Play Range Area (Light)
Make play range area more visible
* Vector Column Color
Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
Co-authored-by: Kite <konero@users.noreply.github.com>
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
2020-09-01 06:51:22 +12:00
|
|
|
QIcon nodeSizeIcon =
|
|
|
|
createQIcon(m_maximizedNode ? "minimizenodes" : "maximizenodes");
|
2020-04-17 19:02:53 +12:00
|
|
|
m_nodeSize = new QAction(
|
|
|
|
nodeSizeIcon,
|
|
|
|
m_maximizedNode ? tr("&Minimize Nodes") : tr("&Maximize Nodes"),
|
|
|
|
m_commonToolbar);
|
2016-06-15 18:43:10 +12:00
|
|
|
connect(m_nodeSize, SIGNAL(triggered()), this, SLOT(changeNodeSize()));
|
2016-03-19 06:57:51 +13:00
|
|
|
|
UI update and Icons from Konero (#126)
* add multi arc mockup
* implement mutli arc
* add join and smooth option
* reset multiarc and arc when deactivated
* create self loop if the last point is the same as the first
* make join option in multiarc consistent with tape tool
* fix a bug where thickness don't affect mutliarc in vector level
* remove join option in geometric tool
* stop mutliarc after closing shape
* double click can also end multi arc
* fix a bug where multiArc will produce buggy stroke
* fix a bug where geometric tools is not deactivated
* add multiArc shortcut
* rewrite multiArc
* revert changes to tvectorimage
* add undo data for multiArc
* Paste as Copy Command for XSheet
* Remove unneeded code
* Bug fix
* prevent guide lines from jumping around in MultiArc
* make stroke color consistent in MultiArc
* remove color in MultiArc's undo data
* make color consistent in MultiArc with previous version
* Fix single image raster levels
* fix compilation error
* fix a bug where multiArc might generate bugged stroke
* Remove ICONV dep (#3304)
* fix crash on saving studio palette
* Move to Paste Special Menu
* Don't Set Fixed Width if Docking a Floating Panel
* Update how_to_build_win.md
New draft of pr for requested changes to windows build instructions.
* fix geometric tool multiarc smooth option
* fix level saving failure
* fix wrong warning after saving palette
* fix a bug where moving a control point while holding alt has unintended result
* fix travis-install (#3389)
* Fix assert debug crash in flipconsole.cpp
Fix crash when using the viewer controls in the console (debug)
* Redraw Audio Waveform
Fills the waveform rather than outlines it.
* Update .gitignore
* fix undo data when drawing arc and mutliarc
* fix overwriting raster drawing palette (#3387)
* mode sensitive fx settings
* Create New Style Command Button (#3394)
* Create New Style Command Button
This PR creates a new button in the pallette editor that creates a new style. Button is large and easy access for a faster and easier workflow. Original code developed by Turtletooth for Tahoma. Given permission to develop within Openoonz.
Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com>
* Update paletteviewergui.cpp
Made changes to the PR per request by Shun.
* Fixed a space within the code that wasn't suppose to be there.
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
* tahoma license (#3396)
* new style button optional
* fix loading pegbars (removing updateKeyframes)
* periodic random expression
* add fx in linear color space
this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd.
in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories.
* fractal noise iwa fx
* skip unnecessary icon invalidation
* fix frame range fill with tablet
* stop function editor to open by dbl clicking key
* Expanding the radius of the rotation handle.
This just changes when the cursor transforms into the rotation tool.
(cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39)
* fix vector img patern stroke style
* Update Stylesheets
- Support the new icon sizes
- XSheet and Timeline significantly redesigned
- Lots of margin fixes and refactoring
- Remove deprecated icons, as some icons are moved into binary
- New Light theme
* New Icons
- Redesigns almost every icon as symbolic
- Adds icons for most commands
* Add Option for Icon Themes
- Adds option for icon themes
- Removes useless label from Preferences category list
* Update Icon Functions
- Adds themePath() boolean
- Adds function for recoloring black pixels in pixmaps to any color
- Rebuilds createQIcon to use fromTheme() and recolorPixmap()
- Removes createQIconOnOff as it seemed to be a rarely used duplicate of createQIcon
- Removes a grey horizontal line drawn above the console play bar in the viewer
* Set Default Icon Theme and Paths
- Sets search paths for icons for use with QIcon::fromTheme()
- Sets default start icon theme on first install
- Sets flag for displaying icons in menus, so we can selectively hide them
* Set Icons for Commands
- Sets icons for the commands
- Hides icons being displayed in menus as most icons are 20x20, they will look blurry when shrunk to 16x16
- Selectively allows icons to display for Tools in menus
* Change Icon Sizes, General Fixes and Stylesheet Additions
- Change icon sizes to new size
- Remove margin around FX Editor window
- Remove white line under color sliders in Style Editor
- Make keyframe icons uniform and color stylable in the stylesheets
- Removes deprecated stylesheet strings
- Redesign GUI for palette list view
- Make tree list header sort row stylable
- Remove black lines from scrollbars in New Project window
- Remove margin around combobox in Level Strip
- Alter how some lines are drawn in the Timeline to fix some alpha issues
- Make conditional fixed onion skin and normal onion skin dots contrast more against a light background area to make sure they have good visibility
- Make text always viewable in the FPS field in console bar
- Increase size of radio buttons in Cleanup Settings
- Increase size of switches in motion path nodes
- Remove unessesary "Layer" label in Timeline and other rects
- Various colors made stylable in the stylesheets; palette numpad and selection frame, cleanup settings border, scene cast folder path, schematic lines, ruler, xsheet lines, keyframes, cell input box and more
- Moves some external stylesheet icons into binary
* Make TPanelTitleBar Icon States Stylable
- Makes icon states for TPanelTitleBar buttons stylable in stylesheets
* Travis Fixes
* Swap Startup Popup Logos
They were in the wrong folders
* Revert "Swap Startup Popup Logos"
This reverts commit 815908a9f3e725f48507dab8a2270bdfa045649d.
* Fix Startup Popup Logo
It wasn't switching
* Feedback Changes
- Change render visualization to clapboard
- Fix text contrast on levels in XSheet
* Make Cell Selection More Clear
* Darken Light Theme and Tint Empty Cell Selection
* Fix missing icons
* Fix memo button
* Bring back colors
* Hide Motion Tab
* Fix Play Range Area (Light)
Make play range area more visible
* Vector Column Color
Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
Co-authored-by: Kite <konero@users.noreply.github.com>
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
2020-09-01 06:51:22 +12:00
|
|
|
QIcon selectModeIcon = createQIcon("selection_schematic");
|
2018-07-20 22:15:22 +12:00
|
|
|
m_selectMode =
|
|
|
|
new QAction(selectModeIcon, tr("&Selection Mode"), m_commonToolbar);
|
|
|
|
m_selectMode->setCheckable(true);
|
|
|
|
connect(m_selectMode, SIGNAL(triggered()), this, SLOT(selectModeEnabled()));
|
|
|
|
|
UI update and Icons from Konero (#126)
* add multi arc mockup
* implement mutli arc
* add join and smooth option
* reset multiarc and arc when deactivated
* create self loop if the last point is the same as the first
* make join option in multiarc consistent with tape tool
* fix a bug where thickness don't affect mutliarc in vector level
* remove join option in geometric tool
* stop mutliarc after closing shape
* double click can also end multi arc
* fix a bug where multiArc will produce buggy stroke
* fix a bug where geometric tools is not deactivated
* add multiArc shortcut
* rewrite multiArc
* revert changes to tvectorimage
* add undo data for multiArc
* Paste as Copy Command for XSheet
* Remove unneeded code
* Bug fix
* prevent guide lines from jumping around in MultiArc
* make stroke color consistent in MultiArc
* remove color in MultiArc's undo data
* make color consistent in MultiArc with previous version
* Fix single image raster levels
* fix compilation error
* fix a bug where multiArc might generate bugged stroke
* Remove ICONV dep (#3304)
* fix crash on saving studio palette
* Move to Paste Special Menu
* Don't Set Fixed Width if Docking a Floating Panel
* Update how_to_build_win.md
New draft of pr for requested changes to windows build instructions.
* fix geometric tool multiarc smooth option
* fix level saving failure
* fix wrong warning after saving palette
* fix a bug where moving a control point while holding alt has unintended result
* fix travis-install (#3389)
* Fix assert debug crash in flipconsole.cpp
Fix crash when using the viewer controls in the console (debug)
* Redraw Audio Waveform
Fills the waveform rather than outlines it.
* Update .gitignore
* fix undo data when drawing arc and mutliarc
* fix overwriting raster drawing palette (#3387)
* mode sensitive fx settings
* Create New Style Command Button (#3394)
* Create New Style Command Button
This PR creates a new button in the pallette editor that creates a new style. Button is large and easy access for a faster and easier workflow. Original code developed by Turtletooth for Tahoma. Given permission to develop within Openoonz.
Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com>
* Update paletteviewergui.cpp
Made changes to the PR per request by Shun.
* Fixed a space within the code that wasn't suppose to be there.
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
* tahoma license (#3396)
* new style button optional
* fix loading pegbars (removing updateKeyframes)
* periodic random expression
* add fx in linear color space
this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd.
in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories.
* fractal noise iwa fx
* skip unnecessary icon invalidation
* fix frame range fill with tablet
* stop function editor to open by dbl clicking key
* Expanding the radius of the rotation handle.
This just changes when the cursor transforms into the rotation tool.
(cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39)
* fix vector img patern stroke style
* Update Stylesheets
- Support the new icon sizes
- XSheet and Timeline significantly redesigned
- Lots of margin fixes and refactoring
- Remove deprecated icons, as some icons are moved into binary
- New Light theme
* New Icons
- Redesigns almost every icon as symbolic
- Adds icons for most commands
* Add Option for Icon Themes
- Adds option for icon themes
- Removes useless label from Preferences category list
* Update Icon Functions
- Adds themePath() boolean
- Adds function for recoloring black pixels in pixmaps to any color
- Rebuilds createQIcon to use fromTheme() and recolorPixmap()
- Removes createQIconOnOff as it seemed to be a rarely used duplicate of createQIcon
- Removes a grey horizontal line drawn above the console play bar in the viewer
* Set Default Icon Theme and Paths
- Sets search paths for icons for use with QIcon::fromTheme()
- Sets default start icon theme on first install
- Sets flag for displaying icons in menus, so we can selectively hide them
* Set Icons for Commands
- Sets icons for the commands
- Hides icons being displayed in menus as most icons are 20x20, they will look blurry when shrunk to 16x16
- Selectively allows icons to display for Tools in menus
* Change Icon Sizes, General Fixes and Stylesheet Additions
- Change icon sizes to new size
- Remove margin around FX Editor window
- Remove white line under color sliders in Style Editor
- Make keyframe icons uniform and color stylable in the stylesheets
- Removes deprecated stylesheet strings
- Redesign GUI for palette list view
- Make tree list header sort row stylable
- Remove black lines from scrollbars in New Project window
- Remove margin around combobox in Level Strip
- Alter how some lines are drawn in the Timeline to fix some alpha issues
- Make conditional fixed onion skin and normal onion skin dots contrast more against a light background area to make sure they have good visibility
- Make text always viewable in the FPS field in console bar
- Increase size of radio buttons in Cleanup Settings
- Increase size of switches in motion path nodes
- Remove unessesary "Layer" label in Timeline and other rects
- Various colors made stylable in the stylesheets; palette numpad and selection frame, cleanup settings border, scene cast folder path, schematic lines, ruler, xsheet lines, keyframes, cell input box and more
- Moves some external stylesheet icons into binary
* Make TPanelTitleBar Icon States Stylable
- Makes icon states for TPanelTitleBar buttons stylable in stylesheets
* Travis Fixes
* Swap Startup Popup Logos
They were in the wrong folders
* Revert "Swap Startup Popup Logos"
This reverts commit 815908a9f3e725f48507dab8a2270bdfa045649d.
* Fix Startup Popup Logo
It wasn't switching
* Feedback Changes
- Change render visualization to clapboard
- Fix text contrast on levels in XSheet
* Make Cell Selection More Clear
* Darken Light Theme and Tint Empty Cell Selection
* Fix missing icons
* Fix memo button
* Bring back colors
* Hide Motion Tab
* Fix Play Range Area (Light)
Make play range area more visible
* Vector Column Color
Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
Co-authored-by: Kite <konero@users.noreply.github.com>
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
2020-09-01 06:51:22 +12:00
|
|
|
QIcon zoomModeIcon = createQIcon("zoom_schematic");
|
2018-07-20 22:15:22 +12:00
|
|
|
m_zoomMode = new QAction(zoomModeIcon, tr("&Zoom Mode"), m_commonToolbar);
|
|
|
|
m_zoomMode->setCheckable(true);
|
|
|
|
connect(m_zoomMode, SIGNAL(triggered()), this, SLOT(zoomModeEnabled()));
|
|
|
|
|
UI update and Icons from Konero (#126)
* add multi arc mockup
* implement mutli arc
* add join and smooth option
* reset multiarc and arc when deactivated
* create self loop if the last point is the same as the first
* make join option in multiarc consistent with tape tool
* fix a bug where thickness don't affect mutliarc in vector level
* remove join option in geometric tool
* stop mutliarc after closing shape
* double click can also end multi arc
* fix a bug where multiArc will produce buggy stroke
* fix a bug where geometric tools is not deactivated
* add multiArc shortcut
* rewrite multiArc
* revert changes to tvectorimage
* add undo data for multiArc
* Paste as Copy Command for XSheet
* Remove unneeded code
* Bug fix
* prevent guide lines from jumping around in MultiArc
* make stroke color consistent in MultiArc
* remove color in MultiArc's undo data
* make color consistent in MultiArc with previous version
* Fix single image raster levels
* fix compilation error
* fix a bug where multiArc might generate bugged stroke
* Remove ICONV dep (#3304)
* fix crash on saving studio palette
* Move to Paste Special Menu
* Don't Set Fixed Width if Docking a Floating Panel
* Update how_to_build_win.md
New draft of pr for requested changes to windows build instructions.
* fix geometric tool multiarc smooth option
* fix level saving failure
* fix wrong warning after saving palette
* fix a bug where moving a control point while holding alt has unintended result
* fix travis-install (#3389)
* Fix assert debug crash in flipconsole.cpp
Fix crash when using the viewer controls in the console (debug)
* Redraw Audio Waveform
Fills the waveform rather than outlines it.
* Update .gitignore
* fix undo data when drawing arc and mutliarc
* fix overwriting raster drawing palette (#3387)
* mode sensitive fx settings
* Create New Style Command Button (#3394)
* Create New Style Command Button
This PR creates a new button in the pallette editor that creates a new style. Button is large and easy access for a faster and easier workflow. Original code developed by Turtletooth for Tahoma. Given permission to develop within Openoonz.
Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com>
* Update paletteviewergui.cpp
Made changes to the PR per request by Shun.
* Fixed a space within the code that wasn't suppose to be there.
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
* tahoma license (#3396)
* new style button optional
* fix loading pegbars (removing updateKeyframes)
* periodic random expression
* add fx in linear color space
this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd.
in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories.
* fractal noise iwa fx
* skip unnecessary icon invalidation
* fix frame range fill with tablet
* stop function editor to open by dbl clicking key
* Expanding the radius of the rotation handle.
This just changes when the cursor transforms into the rotation tool.
(cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39)
* fix vector img patern stroke style
* Update Stylesheets
- Support the new icon sizes
- XSheet and Timeline significantly redesigned
- Lots of margin fixes and refactoring
- Remove deprecated icons, as some icons are moved into binary
- New Light theme
* New Icons
- Redesigns almost every icon as symbolic
- Adds icons for most commands
* Add Option for Icon Themes
- Adds option for icon themes
- Removes useless label from Preferences category list
* Update Icon Functions
- Adds themePath() boolean
- Adds function for recoloring black pixels in pixmaps to any color
- Rebuilds createQIcon to use fromTheme() and recolorPixmap()
- Removes createQIconOnOff as it seemed to be a rarely used duplicate of createQIcon
- Removes a grey horizontal line drawn above the console play bar in the viewer
* Set Default Icon Theme and Paths
- Sets search paths for icons for use with QIcon::fromTheme()
- Sets default start icon theme on first install
- Sets flag for displaying icons in menus, so we can selectively hide them
* Set Icons for Commands
- Sets icons for the commands
- Hides icons being displayed in menus as most icons are 20x20, they will look blurry when shrunk to 16x16
- Selectively allows icons to display for Tools in menus
* Change Icon Sizes, General Fixes and Stylesheet Additions
- Change icon sizes to new size
- Remove margin around FX Editor window
- Remove white line under color sliders in Style Editor
- Make keyframe icons uniform and color stylable in the stylesheets
- Removes deprecated stylesheet strings
- Redesign GUI for palette list view
- Make tree list header sort row stylable
- Remove black lines from scrollbars in New Project window
- Remove margin around combobox in Level Strip
- Alter how some lines are drawn in the Timeline to fix some alpha issues
- Make conditional fixed onion skin and normal onion skin dots contrast more against a light background area to make sure they have good visibility
- Make text always viewable in the FPS field in console bar
- Increase size of radio buttons in Cleanup Settings
- Increase size of switches in motion path nodes
- Remove unessesary "Layer" label in Timeline and other rects
- Various colors made stylable in the stylesheets; palette numpad and selection frame, cleanup settings border, scene cast folder path, schematic lines, ruler, xsheet lines, keyframes, cell input box and more
- Moves some external stylesheet icons into binary
* Make TPanelTitleBar Icon States Stylable
- Makes icon states for TPanelTitleBar buttons stylable in stylesheets
* Travis Fixes
* Swap Startup Popup Logos
They were in the wrong folders
* Revert "Swap Startup Popup Logos"
This reverts commit 815908a9f3e725f48507dab8a2270bdfa045649d.
* Fix Startup Popup Logo
It wasn't switching
* Feedback Changes
- Change render visualization to clapboard
- Fix text contrast on levels in XSheet
* Make Cell Selection More Clear
* Darken Light Theme and Tint Empty Cell Selection
* Fix missing icons
* Fix memo button
* Bring back colors
* Hide Motion Tab
* Fix Play Range Area (Light)
Make play range area more visible
* Vector Column Color
Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
Co-authored-by: Kite <konero@users.noreply.github.com>
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
2020-09-01 06:51:22 +12:00
|
|
|
QIcon handModeIcon = createQIcon("hand_schematic");
|
2018-07-20 22:15:22 +12:00
|
|
|
m_handMode = new QAction(handModeIcon, tr("&Hand Mode"), m_commonToolbar);
|
|
|
|
m_handMode->setCheckable(true);
|
|
|
|
connect(m_handMode, SIGNAL(triggered()), this, SLOT(handModeEnabled()));
|
|
|
|
|
|
|
|
setCursorMode(m_cursorMode);
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
if (m_fullSchematic) {
|
|
|
|
// AddPegbar
|
|
|
|
addPegbar = new QAction(tr("&New Pegbar"), m_stageToolbar);
|
UI update and Icons from Konero (#126)
* add multi arc mockup
* implement mutli arc
* add join and smooth option
* reset multiarc and arc when deactivated
* create self loop if the last point is the same as the first
* make join option in multiarc consistent with tape tool
* fix a bug where thickness don't affect mutliarc in vector level
* remove join option in geometric tool
* stop mutliarc after closing shape
* double click can also end multi arc
* fix a bug where multiArc will produce buggy stroke
* fix a bug where geometric tools is not deactivated
* add multiArc shortcut
* rewrite multiArc
* revert changes to tvectorimage
* add undo data for multiArc
* Paste as Copy Command for XSheet
* Remove unneeded code
* Bug fix
* prevent guide lines from jumping around in MultiArc
* make stroke color consistent in MultiArc
* remove color in MultiArc's undo data
* make color consistent in MultiArc with previous version
* Fix single image raster levels
* fix compilation error
* fix a bug where multiArc might generate bugged stroke
* Remove ICONV dep (#3304)
* fix crash on saving studio palette
* Move to Paste Special Menu
* Don't Set Fixed Width if Docking a Floating Panel
* Update how_to_build_win.md
New draft of pr for requested changes to windows build instructions.
* fix geometric tool multiarc smooth option
* fix level saving failure
* fix wrong warning after saving palette
* fix a bug where moving a control point while holding alt has unintended result
* fix travis-install (#3389)
* Fix assert debug crash in flipconsole.cpp
Fix crash when using the viewer controls in the console (debug)
* Redraw Audio Waveform
Fills the waveform rather than outlines it.
* Update .gitignore
* fix undo data when drawing arc and mutliarc
* fix overwriting raster drawing palette (#3387)
* mode sensitive fx settings
* Create New Style Command Button (#3394)
* Create New Style Command Button
This PR creates a new button in the pallette editor that creates a new style. Button is large and easy access for a faster and easier workflow. Original code developed by Turtletooth for Tahoma. Given permission to develop within Openoonz.
Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com>
* Update paletteviewergui.cpp
Made changes to the PR per request by Shun.
* Fixed a space within the code that wasn't suppose to be there.
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
* tahoma license (#3396)
* new style button optional
* fix loading pegbars (removing updateKeyframes)
* periodic random expression
* add fx in linear color space
this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd.
in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories.
* fractal noise iwa fx
* skip unnecessary icon invalidation
* fix frame range fill with tablet
* stop function editor to open by dbl clicking key
* Expanding the radius of the rotation handle.
This just changes when the cursor transforms into the rotation tool.
(cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39)
* fix vector img patern stroke style
* Update Stylesheets
- Support the new icon sizes
- XSheet and Timeline significantly redesigned
- Lots of margin fixes and refactoring
- Remove deprecated icons, as some icons are moved into binary
- New Light theme
* New Icons
- Redesigns almost every icon as symbolic
- Adds icons for most commands
* Add Option for Icon Themes
- Adds option for icon themes
- Removes useless label from Preferences category list
* Update Icon Functions
- Adds themePath() boolean
- Adds function for recoloring black pixels in pixmaps to any color
- Rebuilds createQIcon to use fromTheme() and recolorPixmap()
- Removes createQIconOnOff as it seemed to be a rarely used duplicate of createQIcon
- Removes a grey horizontal line drawn above the console play bar in the viewer
* Set Default Icon Theme and Paths
- Sets search paths for icons for use with QIcon::fromTheme()
- Sets default start icon theme on first install
- Sets flag for displaying icons in menus, so we can selectively hide them
* Set Icons for Commands
- Sets icons for the commands
- Hides icons being displayed in menus as most icons are 20x20, they will look blurry when shrunk to 16x16
- Selectively allows icons to display for Tools in menus
* Change Icon Sizes, General Fixes and Stylesheet Additions
- Change icon sizes to new size
- Remove margin around FX Editor window
- Remove white line under color sliders in Style Editor
- Make keyframe icons uniform and color stylable in the stylesheets
- Removes deprecated stylesheet strings
- Redesign GUI for palette list view
- Make tree list header sort row stylable
- Remove black lines from scrollbars in New Project window
- Remove margin around combobox in Level Strip
- Alter how some lines are drawn in the Timeline to fix some alpha issues
- Make conditional fixed onion skin and normal onion skin dots contrast more against a light background area to make sure they have good visibility
- Make text always viewable in the FPS field in console bar
- Increase size of radio buttons in Cleanup Settings
- Increase size of switches in motion path nodes
- Remove unessesary "Layer" label in Timeline and other rects
- Various colors made stylable in the stylesheets; palette numpad and selection frame, cleanup settings border, scene cast folder path, schematic lines, ruler, xsheet lines, keyframes, cell input box and more
- Moves some external stylesheet icons into binary
* Make TPanelTitleBar Icon States Stylable
- Makes icon states for TPanelTitleBar buttons stylable in stylesheets
* Travis Fixes
* Swap Startup Popup Logos
They were in the wrong folders
* Revert "Swap Startup Popup Logos"
This reverts commit 815908a9f3e725f48507dab8a2270bdfa045649d.
* Fix Startup Popup Logo
It wasn't switching
* Feedback Changes
- Change render visualization to clapboard
- Fix text contrast on levels in XSheet
* Make Cell Selection More Clear
* Darken Light Theme and Tint Empty Cell Selection
* Fix missing icons
* Fix memo button
* Bring back colors
* Hide Motion Tab
* Fix Play Range Area (Light)
Make play range area more visible
* Vector Column Color
Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
Co-authored-by: Kite <konero@users.noreply.github.com>
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
2020-09-01 06:51:22 +12:00
|
|
|
QIcon addPegbarIcon = createQIcon("pegbar");
|
2016-06-15 18:43:10 +12:00
|
|
|
addPegbar->setIcon(addPegbarIcon);
|
|
|
|
connect(addPegbar, SIGNAL(triggered()), m_stageScene,
|
|
|
|
SLOT(onPegbarAdded()));
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
// AddCamera
|
|
|
|
addCamera = new QAction(tr("&New Camera"), m_stageToolbar);
|
UI update and Icons from Konero (#126)
* add multi arc mockup
* implement mutli arc
* add join and smooth option
* reset multiarc and arc when deactivated
* create self loop if the last point is the same as the first
* make join option in multiarc consistent with tape tool
* fix a bug where thickness don't affect mutliarc in vector level
* remove join option in geometric tool
* stop mutliarc after closing shape
* double click can also end multi arc
* fix a bug where multiArc will produce buggy stroke
* fix a bug where geometric tools is not deactivated
* add multiArc shortcut
* rewrite multiArc
* revert changes to tvectorimage
* add undo data for multiArc
* Paste as Copy Command for XSheet
* Remove unneeded code
* Bug fix
* prevent guide lines from jumping around in MultiArc
* make stroke color consistent in MultiArc
* remove color in MultiArc's undo data
* make color consistent in MultiArc with previous version
* Fix single image raster levels
* fix compilation error
* fix a bug where multiArc might generate bugged stroke
* Remove ICONV dep (#3304)
* fix crash on saving studio palette
* Move to Paste Special Menu
* Don't Set Fixed Width if Docking a Floating Panel
* Update how_to_build_win.md
New draft of pr for requested changes to windows build instructions.
* fix geometric tool multiarc smooth option
* fix level saving failure
* fix wrong warning after saving palette
* fix a bug where moving a control point while holding alt has unintended result
* fix travis-install (#3389)
* Fix assert debug crash in flipconsole.cpp
Fix crash when using the viewer controls in the console (debug)
* Redraw Audio Waveform
Fills the waveform rather than outlines it.
* Update .gitignore
* fix undo data when drawing arc and mutliarc
* fix overwriting raster drawing palette (#3387)
* mode sensitive fx settings
* Create New Style Command Button (#3394)
* Create New Style Command Button
This PR creates a new button in the pallette editor that creates a new style. Button is large and easy access for a faster and easier workflow. Original code developed by Turtletooth for Tahoma. Given permission to develop within Openoonz.
Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com>
* Update paletteviewergui.cpp
Made changes to the PR per request by Shun.
* Fixed a space within the code that wasn't suppose to be there.
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
* tahoma license (#3396)
* new style button optional
* fix loading pegbars (removing updateKeyframes)
* periodic random expression
* add fx in linear color space
this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd.
in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories.
* fractal noise iwa fx
* skip unnecessary icon invalidation
* fix frame range fill with tablet
* stop function editor to open by dbl clicking key
* Expanding the radius of the rotation handle.
This just changes when the cursor transforms into the rotation tool.
(cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39)
* fix vector img patern stroke style
* Update Stylesheets
- Support the new icon sizes
- XSheet and Timeline significantly redesigned
- Lots of margin fixes and refactoring
- Remove deprecated icons, as some icons are moved into binary
- New Light theme
* New Icons
- Redesigns almost every icon as symbolic
- Adds icons for most commands
* Add Option for Icon Themes
- Adds option for icon themes
- Removes useless label from Preferences category list
* Update Icon Functions
- Adds themePath() boolean
- Adds function for recoloring black pixels in pixmaps to any color
- Rebuilds createQIcon to use fromTheme() and recolorPixmap()
- Removes createQIconOnOff as it seemed to be a rarely used duplicate of createQIcon
- Removes a grey horizontal line drawn above the console play bar in the viewer
* Set Default Icon Theme and Paths
- Sets search paths for icons for use with QIcon::fromTheme()
- Sets default start icon theme on first install
- Sets flag for displaying icons in menus, so we can selectively hide them
* Set Icons for Commands
- Sets icons for the commands
- Hides icons being displayed in menus as most icons are 20x20, they will look blurry when shrunk to 16x16
- Selectively allows icons to display for Tools in menus
* Change Icon Sizes, General Fixes and Stylesheet Additions
- Change icon sizes to new size
- Remove margin around FX Editor window
- Remove white line under color sliders in Style Editor
- Make keyframe icons uniform and color stylable in the stylesheets
- Removes deprecated stylesheet strings
- Redesign GUI for palette list view
- Make tree list header sort row stylable
- Remove black lines from scrollbars in New Project window
- Remove margin around combobox in Level Strip
- Alter how some lines are drawn in the Timeline to fix some alpha issues
- Make conditional fixed onion skin and normal onion skin dots contrast more against a light background area to make sure they have good visibility
- Make text always viewable in the FPS field in console bar
- Increase size of radio buttons in Cleanup Settings
- Increase size of switches in motion path nodes
- Remove unessesary "Layer" label in Timeline and other rects
- Various colors made stylable in the stylesheets; palette numpad and selection frame, cleanup settings border, scene cast folder path, schematic lines, ruler, xsheet lines, keyframes, cell input box and more
- Moves some external stylesheet icons into binary
* Make TPanelTitleBar Icon States Stylable
- Makes icon states for TPanelTitleBar buttons stylable in stylesheets
* Travis Fixes
* Swap Startup Popup Logos
They were in the wrong folders
* Revert "Swap Startup Popup Logos"
This reverts commit 815908a9f3e725f48507dab8a2270bdfa045649d.
* Fix Startup Popup Logo
It wasn't switching
* Feedback Changes
- Change render visualization to clapboard
- Fix text contrast on levels in XSheet
* Make Cell Selection More Clear
* Darken Light Theme and Tint Empty Cell Selection
* Fix missing icons
* Fix memo button
* Bring back colors
* Hide Motion Tab
* Fix Play Range Area (Light)
Make play range area more visible
* Vector Column Color
Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
Co-authored-by: Kite <konero@users.noreply.github.com>
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
2020-09-01 06:51:22 +12:00
|
|
|
QIcon addCameraIcon = createQIcon("camera");
|
2016-06-15 18:43:10 +12:00
|
|
|
addCamera->setIcon(addCameraIcon);
|
|
|
|
connect(addCamera, SIGNAL(triggered()), m_stageScene,
|
|
|
|
SLOT(onCameraAdded()));
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
// AddSpline
|
|
|
|
addSpline = new QAction(tr("&New Motion Path"), m_stageToolbar);
|
UI update and Icons from Konero (#126)
* add multi arc mockup
* implement mutli arc
* add join and smooth option
* reset multiarc and arc when deactivated
* create self loop if the last point is the same as the first
* make join option in multiarc consistent with tape tool
* fix a bug where thickness don't affect mutliarc in vector level
* remove join option in geometric tool
* stop mutliarc after closing shape
* double click can also end multi arc
* fix a bug where multiArc will produce buggy stroke
* fix a bug where geometric tools is not deactivated
* add multiArc shortcut
* rewrite multiArc
* revert changes to tvectorimage
* add undo data for multiArc
* Paste as Copy Command for XSheet
* Remove unneeded code
* Bug fix
* prevent guide lines from jumping around in MultiArc
* make stroke color consistent in MultiArc
* remove color in MultiArc's undo data
* make color consistent in MultiArc with previous version
* Fix single image raster levels
* fix compilation error
* fix a bug where multiArc might generate bugged stroke
* Remove ICONV dep (#3304)
* fix crash on saving studio palette
* Move to Paste Special Menu
* Don't Set Fixed Width if Docking a Floating Panel
* Update how_to_build_win.md
New draft of pr for requested changes to windows build instructions.
* fix geometric tool multiarc smooth option
* fix level saving failure
* fix wrong warning after saving palette
* fix a bug where moving a control point while holding alt has unintended result
* fix travis-install (#3389)
* Fix assert debug crash in flipconsole.cpp
Fix crash when using the viewer controls in the console (debug)
* Redraw Audio Waveform
Fills the waveform rather than outlines it.
* Update .gitignore
* fix undo data when drawing arc and mutliarc
* fix overwriting raster drawing palette (#3387)
* mode sensitive fx settings
* Create New Style Command Button (#3394)
* Create New Style Command Button
This PR creates a new button in the pallette editor that creates a new style. Button is large and easy access for a faster and easier workflow. Original code developed by Turtletooth for Tahoma. Given permission to develop within Openoonz.
Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com>
* Update paletteviewergui.cpp
Made changes to the PR per request by Shun.
* Fixed a space within the code that wasn't suppose to be there.
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
* tahoma license (#3396)
* new style button optional
* fix loading pegbars (removing updateKeyframes)
* periodic random expression
* add fx in linear color space
this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd.
in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories.
* fractal noise iwa fx
* skip unnecessary icon invalidation
* fix frame range fill with tablet
* stop function editor to open by dbl clicking key
* Expanding the radius of the rotation handle.
This just changes when the cursor transforms into the rotation tool.
(cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39)
* fix vector img patern stroke style
* Update Stylesheets
- Support the new icon sizes
- XSheet and Timeline significantly redesigned
- Lots of margin fixes and refactoring
- Remove deprecated icons, as some icons are moved into binary
- New Light theme
* New Icons
- Redesigns almost every icon as symbolic
- Adds icons for most commands
* Add Option for Icon Themes
- Adds option for icon themes
- Removes useless label from Preferences category list
* Update Icon Functions
- Adds themePath() boolean
- Adds function for recoloring black pixels in pixmaps to any color
- Rebuilds createQIcon to use fromTheme() and recolorPixmap()
- Removes createQIconOnOff as it seemed to be a rarely used duplicate of createQIcon
- Removes a grey horizontal line drawn above the console play bar in the viewer
* Set Default Icon Theme and Paths
- Sets search paths for icons for use with QIcon::fromTheme()
- Sets default start icon theme on first install
- Sets flag for displaying icons in menus, so we can selectively hide them
* Set Icons for Commands
- Sets icons for the commands
- Hides icons being displayed in menus as most icons are 20x20, they will look blurry when shrunk to 16x16
- Selectively allows icons to display for Tools in menus
* Change Icon Sizes, General Fixes and Stylesheet Additions
- Change icon sizes to new size
- Remove margin around FX Editor window
- Remove white line under color sliders in Style Editor
- Make keyframe icons uniform and color stylable in the stylesheets
- Removes deprecated stylesheet strings
- Redesign GUI for palette list view
- Make tree list header sort row stylable
- Remove black lines from scrollbars in New Project window
- Remove margin around combobox in Level Strip
- Alter how some lines are drawn in the Timeline to fix some alpha issues
- Make conditional fixed onion skin and normal onion skin dots contrast more against a light background area to make sure they have good visibility
- Make text always viewable in the FPS field in console bar
- Increase size of radio buttons in Cleanup Settings
- Increase size of switches in motion path nodes
- Remove unessesary "Layer" label in Timeline and other rects
- Various colors made stylable in the stylesheets; palette numpad and selection frame, cleanup settings border, scene cast folder path, schematic lines, ruler, xsheet lines, keyframes, cell input box and more
- Moves some external stylesheet icons into binary
* Make TPanelTitleBar Icon States Stylable
- Makes icon states for TPanelTitleBar buttons stylable in stylesheets
* Travis Fixes
* Swap Startup Popup Logos
They were in the wrong folders
* Revert "Swap Startup Popup Logos"
This reverts commit 815908a9f3e725f48507dab8a2270bdfa045649d.
* Fix Startup Popup Logo
It wasn't switching
* Feedback Changes
- Change render visualization to clapboard
- Fix text contrast on levels in XSheet
* Make Cell Selection More Clear
* Darken Light Theme and Tint Empty Cell Selection
* Fix missing icons
* Fix memo button
* Bring back colors
* Hide Motion Tab
* Fix Play Range Area (Light)
Make play range area more visible
* Vector Column Color
Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
Co-authored-by: Kite <konero@users.noreply.github.com>
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
2020-09-01 06:51:22 +12:00
|
|
|
QIcon addSplineIcon = createQIcon("motionpath");
|
2016-06-15 18:43:10 +12:00
|
|
|
addSpline->setIcon(addSplineIcon);
|
|
|
|
connect(addSpline, SIGNAL(triggered()), m_stageScene,
|
|
|
|
SLOT(onSplineAdded()));
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
// Switch display of stage schematic's output port
|
|
|
|
switchPort =
|
2021-07-08 13:39:28 +12:00
|
|
|
new QAction(tr("&Switch output port display mode"), m_stageToolbar);
|
2016-06-15 18:43:10 +12:00
|
|
|
switchPort->setCheckable(true);
|
|
|
|
switchPort->setChecked(m_stageScene->isShowLetterOnPortFlagEnabled());
|
UI update and Icons from Konero (#126)
* add multi arc mockup
* implement mutli arc
* add join and smooth option
* reset multiarc and arc when deactivated
* create self loop if the last point is the same as the first
* make join option in multiarc consistent with tape tool
* fix a bug where thickness don't affect mutliarc in vector level
* remove join option in geometric tool
* stop mutliarc after closing shape
* double click can also end multi arc
* fix a bug where multiArc will produce buggy stroke
* fix a bug where geometric tools is not deactivated
* add multiArc shortcut
* rewrite multiArc
* revert changes to tvectorimage
* add undo data for multiArc
* Paste as Copy Command for XSheet
* Remove unneeded code
* Bug fix
* prevent guide lines from jumping around in MultiArc
* make stroke color consistent in MultiArc
* remove color in MultiArc's undo data
* make color consistent in MultiArc with previous version
* Fix single image raster levels
* fix compilation error
* fix a bug where multiArc might generate bugged stroke
* Remove ICONV dep (#3304)
* fix crash on saving studio palette
* Move to Paste Special Menu
* Don't Set Fixed Width if Docking a Floating Panel
* Update how_to_build_win.md
New draft of pr for requested changes to windows build instructions.
* fix geometric tool multiarc smooth option
* fix level saving failure
* fix wrong warning after saving palette
* fix a bug where moving a control point while holding alt has unintended result
* fix travis-install (#3389)
* Fix assert debug crash in flipconsole.cpp
Fix crash when using the viewer controls in the console (debug)
* Redraw Audio Waveform
Fills the waveform rather than outlines it.
* Update .gitignore
* fix undo data when drawing arc and mutliarc
* fix overwriting raster drawing palette (#3387)
* mode sensitive fx settings
* Create New Style Command Button (#3394)
* Create New Style Command Button
This PR creates a new button in the pallette editor that creates a new style. Button is large and easy access for a faster and easier workflow. Original code developed by Turtletooth for Tahoma. Given permission to develop within Openoonz.
Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com>
* Update paletteviewergui.cpp
Made changes to the PR per request by Shun.
* Fixed a space within the code that wasn't suppose to be there.
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
* tahoma license (#3396)
* new style button optional
* fix loading pegbars (removing updateKeyframes)
* periodic random expression
* add fx in linear color space
this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd.
in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories.
* fractal noise iwa fx
* skip unnecessary icon invalidation
* fix frame range fill with tablet
* stop function editor to open by dbl clicking key
* Expanding the radius of the rotation handle.
This just changes when the cursor transforms into the rotation tool.
(cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39)
* fix vector img patern stroke style
* Update Stylesheets
- Support the new icon sizes
- XSheet and Timeline significantly redesigned
- Lots of margin fixes and refactoring
- Remove deprecated icons, as some icons are moved into binary
- New Light theme
* New Icons
- Redesigns almost every icon as symbolic
- Adds icons for most commands
* Add Option for Icon Themes
- Adds option for icon themes
- Removes useless label from Preferences category list
* Update Icon Functions
- Adds themePath() boolean
- Adds function for recoloring black pixels in pixmaps to any color
- Rebuilds createQIcon to use fromTheme() and recolorPixmap()
- Removes createQIconOnOff as it seemed to be a rarely used duplicate of createQIcon
- Removes a grey horizontal line drawn above the console play bar in the viewer
* Set Default Icon Theme and Paths
- Sets search paths for icons for use with QIcon::fromTheme()
- Sets default start icon theme on first install
- Sets flag for displaying icons in menus, so we can selectively hide them
* Set Icons for Commands
- Sets icons for the commands
- Hides icons being displayed in menus as most icons are 20x20, they will look blurry when shrunk to 16x16
- Selectively allows icons to display for Tools in menus
* Change Icon Sizes, General Fixes and Stylesheet Additions
- Change icon sizes to new size
- Remove margin around FX Editor window
- Remove white line under color sliders in Style Editor
- Make keyframe icons uniform and color stylable in the stylesheets
- Removes deprecated stylesheet strings
- Redesign GUI for palette list view
- Make tree list header sort row stylable
- Remove black lines from scrollbars in New Project window
- Remove margin around combobox in Level Strip
- Alter how some lines are drawn in the Timeline to fix some alpha issues
- Make conditional fixed onion skin and normal onion skin dots contrast more against a light background area to make sure they have good visibility
- Make text always viewable in the FPS field in console bar
- Increase size of radio buttons in Cleanup Settings
- Increase size of switches in motion path nodes
- Remove unessesary "Layer" label in Timeline and other rects
- Various colors made stylable in the stylesheets; palette numpad and selection frame, cleanup settings border, scene cast folder path, schematic lines, ruler, xsheet lines, keyframes, cell input box and more
- Moves some external stylesheet icons into binary
* Make TPanelTitleBar Icon States Stylable
- Makes icon states for TPanelTitleBar buttons stylable in stylesheets
* Travis Fixes
* Swap Startup Popup Logos
They were in the wrong folders
* Revert "Swap Startup Popup Logos"
This reverts commit 815908a9f3e725f48507dab8a2270bdfa045649d.
* Fix Startup Popup Logo
It wasn't switching
* Feedback Changes
- Change render visualization to clapboard
- Fix text contrast on levels in XSheet
* Make Cell Selection More Clear
* Darken Light Theme and Tint Empty Cell Selection
* Fix missing icons
* Fix memo button
* Bring back colors
* Hide Motion Tab
* Fix Play Range Area (Light)
Make play range area more visible
* Vector Column Color
Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
Co-authored-by: Kite <konero@users.noreply.github.com>
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
2020-09-01 06:51:22 +12:00
|
|
|
QIcon switchPortIcon = createQIcon("switchport");
|
2016-06-15 18:43:10 +12:00
|
|
|
switchPort->setIcon(switchPortIcon);
|
|
|
|
connect(switchPort, SIGNAL(toggled(bool)), m_stageScene,
|
|
|
|
SLOT(onSwitchPortModeToggled(bool)));
|
|
|
|
|
|
|
|
// InsertFx
|
|
|
|
insertFx = CommandManager::instance()->getAction("MI_InsertFx");
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
// AddOutputFx
|
|
|
|
addOutputFx = CommandManager::instance()->getAction("MI_NewOutputFx");
|
|
|
|
|
2018-07-24 19:52:45 +12:00
|
|
|
// Iconify Fx nodes
|
|
|
|
iconifyNodes = new QAction(tr("&Toggle node icons"), m_fxToolbar);
|
|
|
|
iconifyNodes->setCheckable(true);
|
|
|
|
iconifyNodes->setChecked(!m_fxScene->isNormalIconView());
|
UI update and Icons from Konero (#126)
* add multi arc mockup
* implement mutli arc
* add join and smooth option
* reset multiarc and arc when deactivated
* create self loop if the last point is the same as the first
* make join option in multiarc consistent with tape tool
* fix a bug where thickness don't affect mutliarc in vector level
* remove join option in geometric tool
* stop mutliarc after closing shape
* double click can also end multi arc
* fix a bug where multiArc will produce buggy stroke
* fix a bug where geometric tools is not deactivated
* add multiArc shortcut
* rewrite multiArc
* revert changes to tvectorimage
* add undo data for multiArc
* Paste as Copy Command for XSheet
* Remove unneeded code
* Bug fix
* prevent guide lines from jumping around in MultiArc
* make stroke color consistent in MultiArc
* remove color in MultiArc's undo data
* make color consistent in MultiArc with previous version
* Fix single image raster levels
* fix compilation error
* fix a bug where multiArc might generate bugged stroke
* Remove ICONV dep (#3304)
* fix crash on saving studio palette
* Move to Paste Special Menu
* Don't Set Fixed Width if Docking a Floating Panel
* Update how_to_build_win.md
New draft of pr for requested changes to windows build instructions.
* fix geometric tool multiarc smooth option
* fix level saving failure
* fix wrong warning after saving palette
* fix a bug where moving a control point while holding alt has unintended result
* fix travis-install (#3389)
* Fix assert debug crash in flipconsole.cpp
Fix crash when using the viewer controls in the console (debug)
* Redraw Audio Waveform
Fills the waveform rather than outlines it.
* Update .gitignore
* fix undo data when drawing arc and mutliarc
* fix overwriting raster drawing palette (#3387)
* mode sensitive fx settings
* Create New Style Command Button (#3394)
* Create New Style Command Button
This PR creates a new button in the pallette editor that creates a new style. Button is large and easy access for a faster and easier workflow. Original code developed by Turtletooth for Tahoma. Given permission to develop within Openoonz.
Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com>
* Update paletteviewergui.cpp
Made changes to the PR per request by Shun.
* Fixed a space within the code that wasn't suppose to be there.
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
* tahoma license (#3396)
* new style button optional
* fix loading pegbars (removing updateKeyframes)
* periodic random expression
* add fx in linear color space
this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd.
in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories.
* fractal noise iwa fx
* skip unnecessary icon invalidation
* fix frame range fill with tablet
* stop function editor to open by dbl clicking key
* Expanding the radius of the rotation handle.
This just changes when the cursor transforms into the rotation tool.
(cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39)
* fix vector img patern stroke style
* Update Stylesheets
- Support the new icon sizes
- XSheet and Timeline significantly redesigned
- Lots of margin fixes and refactoring
- Remove deprecated icons, as some icons are moved into binary
- New Light theme
* New Icons
- Redesigns almost every icon as symbolic
- Adds icons for most commands
* Add Option for Icon Themes
- Adds option for icon themes
- Removes useless label from Preferences category list
* Update Icon Functions
- Adds themePath() boolean
- Adds function for recoloring black pixels in pixmaps to any color
- Rebuilds createQIcon to use fromTheme() and recolorPixmap()
- Removes createQIconOnOff as it seemed to be a rarely used duplicate of createQIcon
- Removes a grey horizontal line drawn above the console play bar in the viewer
* Set Default Icon Theme and Paths
- Sets search paths for icons for use with QIcon::fromTheme()
- Sets default start icon theme on first install
- Sets flag for displaying icons in menus, so we can selectively hide them
* Set Icons for Commands
- Sets icons for the commands
- Hides icons being displayed in menus as most icons are 20x20, they will look blurry when shrunk to 16x16
- Selectively allows icons to display for Tools in menus
* Change Icon Sizes, General Fixes and Stylesheet Additions
- Change icon sizes to new size
- Remove margin around FX Editor window
- Remove white line under color sliders in Style Editor
- Make keyframe icons uniform and color stylable in the stylesheets
- Removes deprecated stylesheet strings
- Redesign GUI for palette list view
- Make tree list header sort row stylable
- Remove black lines from scrollbars in New Project window
- Remove margin around combobox in Level Strip
- Alter how some lines are drawn in the Timeline to fix some alpha issues
- Make conditional fixed onion skin and normal onion skin dots contrast more against a light background area to make sure they have good visibility
- Make text always viewable in the FPS field in console bar
- Increase size of radio buttons in Cleanup Settings
- Increase size of switches in motion path nodes
- Remove unessesary "Layer" label in Timeline and other rects
- Various colors made stylable in the stylesheets; palette numpad and selection frame, cleanup settings border, scene cast folder path, schematic lines, ruler, xsheet lines, keyframes, cell input box and more
- Moves some external stylesheet icons into binary
* Make TPanelTitleBar Icon States Stylable
- Makes icon states for TPanelTitleBar buttons stylable in stylesheets
* Travis Fixes
* Swap Startup Popup Logos
They were in the wrong folders
* Revert "Swap Startup Popup Logos"
This reverts commit 815908a9f3e725f48507dab8a2270bdfa045649d.
* Fix Startup Popup Logo
It wasn't switching
* Feedback Changes
- Change render visualization to clapboard
- Fix text contrast on levels in XSheet
* Make Cell Selection More Clear
* Darken Light Theme and Tint Empty Cell Selection
* Fix missing icons
* Fix memo button
* Bring back colors
* Hide Motion Tab
* Fix Play Range Area (Light)
Make play range area more visible
* Vector Column Color
Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
Co-authored-by: Kite <konero@users.noreply.github.com>
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
2020-09-01 06:51:22 +12:00
|
|
|
QIcon iconifyNodesIcon = createQIcon("iconifynodes");
|
2018-07-24 19:52:45 +12:00
|
|
|
iconifyNodes->setIcon(iconifyNodesIcon);
|
|
|
|
connect(iconifyNodes, SIGNAL(toggled(bool)), m_fxScene,
|
|
|
|
SLOT(onIconifyNodesToggled(bool)));
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
// Swap fx/stage schematic
|
UI update and Icons from Konero (#126)
* add multi arc mockup
* implement mutli arc
* add join and smooth option
* reset multiarc and arc when deactivated
* create self loop if the last point is the same as the first
* make join option in multiarc consistent with tape tool
* fix a bug where thickness don't affect mutliarc in vector level
* remove join option in geometric tool
* stop mutliarc after closing shape
* double click can also end multi arc
* fix a bug where multiArc will produce buggy stroke
* fix a bug where geometric tools is not deactivated
* add multiArc shortcut
* rewrite multiArc
* revert changes to tvectorimage
* add undo data for multiArc
* Paste as Copy Command for XSheet
* Remove unneeded code
* Bug fix
* prevent guide lines from jumping around in MultiArc
* make stroke color consistent in MultiArc
* remove color in MultiArc's undo data
* make color consistent in MultiArc with previous version
* Fix single image raster levels
* fix compilation error
* fix a bug where multiArc might generate bugged stroke
* Remove ICONV dep (#3304)
* fix crash on saving studio palette
* Move to Paste Special Menu
* Don't Set Fixed Width if Docking a Floating Panel
* Update how_to_build_win.md
New draft of pr for requested changes to windows build instructions.
* fix geometric tool multiarc smooth option
* fix level saving failure
* fix wrong warning after saving palette
* fix a bug where moving a control point while holding alt has unintended result
* fix travis-install (#3389)
* Fix assert debug crash in flipconsole.cpp
Fix crash when using the viewer controls in the console (debug)
* Redraw Audio Waveform
Fills the waveform rather than outlines it.
* Update .gitignore
* fix undo data when drawing arc and mutliarc
* fix overwriting raster drawing palette (#3387)
* mode sensitive fx settings
* Create New Style Command Button (#3394)
* Create New Style Command Button
This PR creates a new button in the pallette editor that creates a new style. Button is large and easy access for a faster and easier workflow. Original code developed by Turtletooth for Tahoma. Given permission to develop within Openoonz.
Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com>
* Update paletteviewergui.cpp
Made changes to the PR per request by Shun.
* Fixed a space within the code that wasn't suppose to be there.
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
* tahoma license (#3396)
* new style button optional
* fix loading pegbars (removing updateKeyframes)
* periodic random expression
* add fx in linear color space
this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd.
in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories.
* fractal noise iwa fx
* skip unnecessary icon invalidation
* fix frame range fill with tablet
* stop function editor to open by dbl clicking key
* Expanding the radius of the rotation handle.
This just changes when the cursor transforms into the rotation tool.
(cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39)
* fix vector img patern stroke style
* Update Stylesheets
- Support the new icon sizes
- XSheet and Timeline significantly redesigned
- Lots of margin fixes and refactoring
- Remove deprecated icons, as some icons are moved into binary
- New Light theme
* New Icons
- Redesigns almost every icon as symbolic
- Adds icons for most commands
* Add Option for Icon Themes
- Adds option for icon themes
- Removes useless label from Preferences category list
* Update Icon Functions
- Adds themePath() boolean
- Adds function for recoloring black pixels in pixmaps to any color
- Rebuilds createQIcon to use fromTheme() and recolorPixmap()
- Removes createQIconOnOff as it seemed to be a rarely used duplicate of createQIcon
- Removes a grey horizontal line drawn above the console play bar in the viewer
* Set Default Icon Theme and Paths
- Sets search paths for icons for use with QIcon::fromTheme()
- Sets default start icon theme on first install
- Sets flag for displaying icons in menus, so we can selectively hide them
* Set Icons for Commands
- Sets icons for the commands
- Hides icons being displayed in menus as most icons are 20x20, they will look blurry when shrunk to 16x16
- Selectively allows icons to display for Tools in menus
* Change Icon Sizes, General Fixes and Stylesheet Additions
- Change icon sizes to new size
- Remove margin around FX Editor window
- Remove white line under color sliders in Style Editor
- Make keyframe icons uniform and color stylable in the stylesheets
- Removes deprecated stylesheet strings
- Redesign GUI for palette list view
- Make tree list header sort row stylable
- Remove black lines from scrollbars in New Project window
- Remove margin around combobox in Level Strip
- Alter how some lines are drawn in the Timeline to fix some alpha issues
- Make conditional fixed onion skin and normal onion skin dots contrast more against a light background area to make sure they have good visibility
- Make text always viewable in the FPS field in console bar
- Increase size of radio buttons in Cleanup Settings
- Increase size of switches in motion path nodes
- Remove unessesary "Layer" label in Timeline and other rects
- Various colors made stylable in the stylesheets; palette numpad and selection frame, cleanup settings border, scene cast folder path, schematic lines, ruler, xsheet lines, keyframes, cell input box and more
- Moves some external stylesheet icons into binary
* Make TPanelTitleBar Icon States Stylable
- Makes icon states for TPanelTitleBar buttons stylable in stylesheets
* Travis Fixes
* Swap Startup Popup Logos
They were in the wrong folders
* Revert "Swap Startup Popup Logos"
This reverts commit 815908a9f3e725f48507dab8a2270bdfa045649d.
* Fix Startup Popup Logo
It wasn't switching
* Feedback Changes
- Change render visualization to clapboard
- Fix text contrast on levels in XSheet
* Make Cell Selection More Clear
* Darken Light Theme and Tint Empty Cell Selection
* Fix missing icons
* Fix memo button
* Bring back colors
* Hide Motion Tab
* Fix Play Range Area (Light)
Make play range area more visible
* Vector Column Color
Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
Co-authored-by: Kite <konero@users.noreply.github.com>
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
2020-09-01 06:51:22 +12:00
|
|
|
QIcon changeSchematicIcon = createQIcon("swap");
|
2016-06-15 18:43:10 +12:00
|
|
|
m_changeScene =
|
|
|
|
CommandManager::instance()->getAction("A_FxSchematicToggle", true);
|
|
|
|
if (m_changeScene) {
|
|
|
|
m_changeScene->setIcon(changeSchematicIcon);
|
|
|
|
connect(m_changeScene, SIGNAL(triggered()), this,
|
|
|
|
SLOT(onSceneChanged()));
|
|
|
|
} else
|
|
|
|
m_changeScene = 0;
|
|
|
|
}
|
|
|
|
}
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
// Add actions to toolbars (in reverse)
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
m_commonToolbar->addSeparator();
|
|
|
|
m_commonToolbar->addAction(m_nodeSize);
|
|
|
|
m_commonToolbar->addAction(m_normalize);
|
|
|
|
m_commonToolbar->addAction(m_reorder);
|
|
|
|
m_commonToolbar->addAction(m_centerOn);
|
|
|
|
m_commonToolbar->addAction(m_fitSchematic);
|
2018-07-20 22:15:22 +12:00
|
|
|
m_commonToolbar->addSeparator();
|
|
|
|
m_commonToolbar->addAction(m_handMode);
|
|
|
|
m_commonToolbar->addAction(m_zoomMode);
|
|
|
|
m_commonToolbar->addAction(m_selectMode);
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
if (m_fullSchematic) {
|
|
|
|
m_stageToolbar->addSeparator();
|
|
|
|
m_stageToolbar->addAction(switchPort);
|
|
|
|
m_stageToolbar->addSeparator();
|
|
|
|
m_stageToolbar->addAction(addSpline);
|
|
|
|
m_stageToolbar->addAction(addCamera);
|
|
|
|
m_stageToolbar->addAction(addPegbar);
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2018-07-24 19:52:45 +12:00
|
|
|
m_fxToolbar->addSeparator();
|
|
|
|
m_fxToolbar->addAction(iconifyNodes);
|
2016-06-15 18:43:10 +12:00
|
|
|
m_fxToolbar->addSeparator();
|
|
|
|
m_fxToolbar->addAction(addOutputFx);
|
|
|
|
m_fxToolbar->addAction(insertFx);
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
if (m_changeScene) m_swapToolbar->addAction(m_changeScene);
|
|
|
|
}
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
void SchematicViewer::setStageSchematic() {
|
|
|
|
if (m_viewer->scene() != m_stageScene) {
|
|
|
|
m_viewer->setScene(m_stageScene);
|
|
|
|
QRectF rect = m_stageScene->itemsBoundingRect();
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
m_viewer->resetMatrix();
|
|
|
|
m_viewer->centerOn(rect.center());
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
m_fxToolbar->hide();
|
|
|
|
m_stageToolbar->show();
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
m_viewer->update();
|
|
|
|
}
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
parentWidget()->setWindowTitle(QObject::tr("Stage Schematic"));
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
void SchematicViewer::setFxSchematic() {
|
|
|
|
if (m_viewer->scene() != m_fxScene) {
|
|
|
|
m_viewer->setScene(m_fxScene);
|
|
|
|
QRectF rect = m_fxScene->itemsBoundingRect();
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
m_viewer->resetMatrix();
|
|
|
|
m_viewer->centerOn(rect.center());
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
m_stageToolbar->hide();
|
|
|
|
m_fxToolbar->show();
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
// check if the fx scene was small scaled (icon view mode)
|
2018-07-24 19:52:45 +12:00
|
|
|
if (!m_fxScene->isNormalIconView()) m_fxScene->updateScene();
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
m_viewer->update();
|
|
|
|
}
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
parentWidget()->setWindowTitle(QObject::tr("FX Schematic"));
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
void SchematicViewer::onSceneChanged() {
|
|
|
|
if (!hasFocus()) return;
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
QGraphicsScene *scene = m_viewer->scene();
|
|
|
|
if (scene == m_fxScene)
|
|
|
|
setStageSchematic();
|
|
|
|
else if (scene == m_stageScene)
|
|
|
|
setFxSchematic();
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
void SchematicViewer::onSceneSwitched() {
|
|
|
|
m_maximizedNode = m_fxScene->getXsheetHandle()
|
|
|
|
->getXsheet()
|
|
|
|
->getFxDag()
|
|
|
|
->getDagGridDimension() == 0;
|
UI update and Icons from Konero (#126)
* add multi arc mockup
* implement mutli arc
* add join and smooth option
* reset multiarc and arc when deactivated
* create self loop if the last point is the same as the first
* make join option in multiarc consistent with tape tool
* fix a bug where thickness don't affect mutliarc in vector level
* remove join option in geometric tool
* stop mutliarc after closing shape
* double click can also end multi arc
* fix a bug where multiArc will produce buggy stroke
* fix a bug where geometric tools is not deactivated
* add multiArc shortcut
* rewrite multiArc
* revert changes to tvectorimage
* add undo data for multiArc
* Paste as Copy Command for XSheet
* Remove unneeded code
* Bug fix
* prevent guide lines from jumping around in MultiArc
* make stroke color consistent in MultiArc
* remove color in MultiArc's undo data
* make color consistent in MultiArc with previous version
* Fix single image raster levels
* fix compilation error
* fix a bug where multiArc might generate bugged stroke
* Remove ICONV dep (#3304)
* fix crash on saving studio palette
* Move to Paste Special Menu
* Don't Set Fixed Width if Docking a Floating Panel
* Update how_to_build_win.md
New draft of pr for requested changes to windows build instructions.
* fix geometric tool multiarc smooth option
* fix level saving failure
* fix wrong warning after saving palette
* fix a bug where moving a control point while holding alt has unintended result
* fix travis-install (#3389)
* Fix assert debug crash in flipconsole.cpp
Fix crash when using the viewer controls in the console (debug)
* Redraw Audio Waveform
Fills the waveform rather than outlines it.
* Update .gitignore
* fix undo data when drawing arc and mutliarc
* fix overwriting raster drawing palette (#3387)
* mode sensitive fx settings
* Create New Style Command Button (#3394)
* Create New Style Command Button
This PR creates a new button in the pallette editor that creates a new style. Button is large and easy access for a faster and easier workflow. Original code developed by Turtletooth for Tahoma. Given permission to develop within Openoonz.
Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com>
* Update paletteviewergui.cpp
Made changes to the PR per request by Shun.
* Fixed a space within the code that wasn't suppose to be there.
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
* tahoma license (#3396)
* new style button optional
* fix loading pegbars (removing updateKeyframes)
* periodic random expression
* add fx in linear color space
this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd.
in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories.
* fractal noise iwa fx
* skip unnecessary icon invalidation
* fix frame range fill with tablet
* stop function editor to open by dbl clicking key
* Expanding the radius of the rotation handle.
This just changes when the cursor transforms into the rotation tool.
(cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39)
* fix vector img patern stroke style
* Update Stylesheets
- Support the new icon sizes
- XSheet and Timeline significantly redesigned
- Lots of margin fixes and refactoring
- Remove deprecated icons, as some icons are moved into binary
- New Light theme
* New Icons
- Redesigns almost every icon as symbolic
- Adds icons for most commands
* Add Option for Icon Themes
- Adds option for icon themes
- Removes useless label from Preferences category list
* Update Icon Functions
- Adds themePath() boolean
- Adds function for recoloring black pixels in pixmaps to any color
- Rebuilds createQIcon to use fromTheme() and recolorPixmap()
- Removes createQIconOnOff as it seemed to be a rarely used duplicate of createQIcon
- Removes a grey horizontal line drawn above the console play bar in the viewer
* Set Default Icon Theme and Paths
- Sets search paths for icons for use with QIcon::fromTheme()
- Sets default start icon theme on first install
- Sets flag for displaying icons in menus, so we can selectively hide them
* Set Icons for Commands
- Sets icons for the commands
- Hides icons being displayed in menus as most icons are 20x20, they will look blurry when shrunk to 16x16
- Selectively allows icons to display for Tools in menus
* Change Icon Sizes, General Fixes and Stylesheet Additions
- Change icon sizes to new size
- Remove margin around FX Editor window
- Remove white line under color sliders in Style Editor
- Make keyframe icons uniform and color stylable in the stylesheets
- Removes deprecated stylesheet strings
- Redesign GUI for palette list view
- Make tree list header sort row stylable
- Remove black lines from scrollbars in New Project window
- Remove margin around combobox in Level Strip
- Alter how some lines are drawn in the Timeline to fix some alpha issues
- Make conditional fixed onion skin and normal onion skin dots contrast more against a light background area to make sure they have good visibility
- Make text always viewable in the FPS field in console bar
- Increase size of radio buttons in Cleanup Settings
- Increase size of switches in motion path nodes
- Remove unessesary "Layer" label in Timeline and other rects
- Various colors made stylable in the stylesheets; palette numpad and selection frame, cleanup settings border, scene cast folder path, schematic lines, ruler, xsheet lines, keyframes, cell input box and more
- Moves some external stylesheet icons into binary
* Make TPanelTitleBar Icon States Stylable
- Makes icon states for TPanelTitleBar buttons stylable in stylesheets
* Travis Fixes
* Swap Startup Popup Logos
They were in the wrong folders
* Revert "Swap Startup Popup Logos"
This reverts commit 815908a9f3e725f48507dab8a2270bdfa045649d.
* Fix Startup Popup Logo
It wasn't switching
* Feedback Changes
- Change render visualization to clapboard
- Fix text contrast on levels in XSheet
* Make Cell Selection More Clear
* Darken Light Theme and Tint Empty Cell Selection
* Fix missing icons
* Fix memo button
* Bring back colors
* Hide Motion Tab
* Fix Play Range Area (Light)
Make play range area more visible
* Vector Column Color
Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
Co-authored-by: Kite <konero@users.noreply.github.com>
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
2020-09-01 06:51:22 +12:00
|
|
|
QIcon nodeSizeIcon =
|
|
|
|
createQIcon(m_maximizedNode ? "minimizenodes" : "maximizenodes");
|
2016-06-15 18:43:10 +12:00
|
|
|
m_nodeSize->setIcon(nodeSizeIcon);
|
|
|
|
QString label(m_maximizedNode ? tr("&Minimize Nodes")
|
|
|
|
: tr("&Maximize Nodes"));
|
|
|
|
m_nodeSize->setText(label);
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
// reset schematic
|
|
|
|
m_viewer->resetMatrix();
|
|
|
|
m_viewer->centerOn(m_viewer->scene()->itemsBoundingRect().center());
|
2018-07-24 19:52:45 +12:00
|
|
|
if (m_viewer->scene() == m_fxScene && !m_fxScene->isNormalIconView())
|
2016-06-15 18:43:10 +12:00
|
|
|
m_fxScene->updateScene();
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
bool SchematicViewer::isStageSchematicViewed() {
|
|
|
|
QGraphicsScene *scene = m_viewer->scene();
|
|
|
|
return scene == m_stageScene;
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
void SchematicViewer::setStageSchematicViewed(bool isStageSchematic) {
|
|
|
|
if (!m_fullSchematic) isStageSchematic = true;
|
2016-03-19 06:57:51 +13:00
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
if (isStageSchematic == isStageSchematicViewed()) return;
|
|
|
|
if (isStageSchematic)
|
|
|
|
setStageSchematic();
|
|
|
|
else
|
|
|
|
setFxSchematic();
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
2021-07-08 13:39:28 +12:00
|
|
|
// called when the signals xshLevelChanged or objectSwitched is emitted
|
2016-06-15 18:43:10 +12:00
|
|
|
void SchematicViewer::updateScenes() {
|
|
|
|
TStageObjectId id = m_stageScene->getCurrentObject();
|
|
|
|
if (id.isColumn()) {
|
|
|
|
m_stageScene->update();
|
|
|
|
TXsheet *xsh = m_stageScene->getXsheetHandle()->getXsheet();
|
|
|
|
if (!xsh) return;
|
|
|
|
TXshColumn *column = xsh->getColumn(id.getIndex());
|
2020-02-19 20:37:31 +13:00
|
|
|
if (!column || !column->getZeraryFxColumn()) return;
|
|
|
|
TFx *fx = column->getZeraryFxColumn()->getZeraryColumnFx();
|
|
|
|
m_fxScene->getFxHandle()->setFx(fx);
|
2016-06-15 18:43:10 +12:00
|
|
|
m_fxScene->update();
|
|
|
|
}
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2016-06-15 18:43:10 +12:00
|
|
|
void SchematicViewer::changeNodeSize() {
|
|
|
|
m_maximizedNode = !m_maximizedNode;
|
|
|
|
// aggiono l'icona del pulsante;
|
|
|
|
m_fxScene->resizeNodes(m_maximizedNode);
|
|
|
|
m_stageScene->resizeNodes(m_maximizedNode);
|
UI update and Icons from Konero (#126)
* add multi arc mockup
* implement mutli arc
* add join and smooth option
* reset multiarc and arc when deactivated
* create self loop if the last point is the same as the first
* make join option in multiarc consistent with tape tool
* fix a bug where thickness don't affect mutliarc in vector level
* remove join option in geometric tool
* stop mutliarc after closing shape
* double click can also end multi arc
* fix a bug where multiArc will produce buggy stroke
* fix a bug where geometric tools is not deactivated
* add multiArc shortcut
* rewrite multiArc
* revert changes to tvectorimage
* add undo data for multiArc
* Paste as Copy Command for XSheet
* Remove unneeded code
* Bug fix
* prevent guide lines from jumping around in MultiArc
* make stroke color consistent in MultiArc
* remove color in MultiArc's undo data
* make color consistent in MultiArc with previous version
* Fix single image raster levels
* fix compilation error
* fix a bug where multiArc might generate bugged stroke
* Remove ICONV dep (#3304)
* fix crash on saving studio palette
* Move to Paste Special Menu
* Don't Set Fixed Width if Docking a Floating Panel
* Update how_to_build_win.md
New draft of pr for requested changes to windows build instructions.
* fix geometric tool multiarc smooth option
* fix level saving failure
* fix wrong warning after saving palette
* fix a bug where moving a control point while holding alt has unintended result
* fix travis-install (#3389)
* Fix assert debug crash in flipconsole.cpp
Fix crash when using the viewer controls in the console (debug)
* Redraw Audio Waveform
Fills the waveform rather than outlines it.
* Update .gitignore
* fix undo data when drawing arc and mutliarc
* fix overwriting raster drawing palette (#3387)
* mode sensitive fx settings
* Create New Style Command Button (#3394)
* Create New Style Command Button
This PR creates a new button in the pallette editor that creates a new style. Button is large and easy access for a faster and easier workflow. Original code developed by Turtletooth for Tahoma. Given permission to develop within Openoonz.
Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com>
* Update paletteviewergui.cpp
Made changes to the PR per request by Shun.
* Fixed a space within the code that wasn't suppose to be there.
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
* tahoma license (#3396)
* new style button optional
* fix loading pegbars (removing updateKeyframes)
* periodic random expression
* add fx in linear color space
this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd.
in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories.
* fractal noise iwa fx
* skip unnecessary icon invalidation
* fix frame range fill with tablet
* stop function editor to open by dbl clicking key
* Expanding the radius of the rotation handle.
This just changes when the cursor transforms into the rotation tool.
(cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39)
* fix vector img patern stroke style
* Update Stylesheets
- Support the new icon sizes
- XSheet and Timeline significantly redesigned
- Lots of margin fixes and refactoring
- Remove deprecated icons, as some icons are moved into binary
- New Light theme
* New Icons
- Redesigns almost every icon as symbolic
- Adds icons for most commands
* Add Option for Icon Themes
- Adds option for icon themes
- Removes useless label from Preferences category list
* Update Icon Functions
- Adds themePath() boolean
- Adds function for recoloring black pixels in pixmaps to any color
- Rebuilds createQIcon to use fromTheme() and recolorPixmap()
- Removes createQIconOnOff as it seemed to be a rarely used duplicate of createQIcon
- Removes a grey horizontal line drawn above the console play bar in the viewer
* Set Default Icon Theme and Paths
- Sets search paths for icons for use with QIcon::fromTheme()
- Sets default start icon theme on first install
- Sets flag for displaying icons in menus, so we can selectively hide them
* Set Icons for Commands
- Sets icons for the commands
- Hides icons being displayed in menus as most icons are 20x20, they will look blurry when shrunk to 16x16
- Selectively allows icons to display for Tools in menus
* Change Icon Sizes, General Fixes and Stylesheet Additions
- Change icon sizes to new size
- Remove margin around FX Editor window
- Remove white line under color sliders in Style Editor
- Make keyframe icons uniform and color stylable in the stylesheets
- Removes deprecated stylesheet strings
- Redesign GUI for palette list view
- Make tree list header sort row stylable
- Remove black lines from scrollbars in New Project window
- Remove margin around combobox in Level Strip
- Alter how some lines are drawn in the Timeline to fix some alpha issues
- Make conditional fixed onion skin and normal onion skin dots contrast more against a light background area to make sure they have good visibility
- Make text always viewable in the FPS field in console bar
- Increase size of radio buttons in Cleanup Settings
- Increase size of switches in motion path nodes
- Remove unessesary "Layer" label in Timeline and other rects
- Various colors made stylable in the stylesheets; palette numpad and selection frame, cleanup settings border, scene cast folder path, schematic lines, ruler, xsheet lines, keyframes, cell input box and more
- Moves some external stylesheet icons into binary
* Make TPanelTitleBar Icon States Stylable
- Makes icon states for TPanelTitleBar buttons stylable in stylesheets
* Travis Fixes
* Swap Startup Popup Logos
They were in the wrong folders
* Revert "Swap Startup Popup Logos"
This reverts commit 815908a9f3e725f48507dab8a2270bdfa045649d.
* Fix Startup Popup Logo
It wasn't switching
* Feedback Changes
- Change render visualization to clapboard
- Fix text contrast on levels in XSheet
* Make Cell Selection More Clear
* Darken Light Theme and Tint Empty Cell Selection
* Fix missing icons
* Fix memo button
* Bring back colors
* Hide Motion Tab
* Fix Play Range Area (Light)
Make play range area more visible
* Vector Column Color
Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
Co-authored-by: Kite <konero@users.noreply.github.com>
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
2020-09-01 06:51:22 +12:00
|
|
|
QIcon nodeSizeIcon =
|
|
|
|
createQIcon(m_maximizedNode ? "minimizenodes" : "maximizenodes");
|
2016-06-15 18:43:10 +12:00
|
|
|
m_nodeSize->setIcon(nodeSizeIcon);
|
|
|
|
QString label(m_maximizedNode ? tr("&Minimize Nodes")
|
|
|
|
: tr("&Maximize Nodes"));
|
|
|
|
m_nodeSize->setText(label);
|
2016-03-19 06:57:51 +13:00
|
|
|
}
|
2018-07-20 22:15:22 +12:00
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2018-07-24 19:52:45 +12:00
|
|
|
QColor SchematicViewer::getSelectedNodeTextColor() {
|
|
|
|
// get colors
|
|
|
|
TPixel currentColumnPixel;
|
|
|
|
Preferences::instance()->getCurrentColumnData(currentColumnPixel);
|
|
|
|
QColor currentColumnColor((int)currentColumnPixel.r,
|
|
|
|
(int)currentColumnPixel.g,
|
|
|
|
(int)currentColumnPixel.b, 255);
|
|
|
|
return currentColumnColor;
|
|
|
|
}
|
2018-07-25 15:47:52 +12:00
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2018-07-20 22:15:22 +12:00
|
|
|
void SchematicViewer::setCursorMode(CursorMode cursorMode) {
|
|
|
|
m_cursorMode = cursorMode;
|
|
|
|
m_viewer->setCursorMode(m_cursorMode);
|
|
|
|
|
|
|
|
m_selectMode->setChecked((m_cursorMode == CursorMode::Select));
|
|
|
|
m_zoomMode->setChecked((m_cursorMode == CursorMode::Zoom));
|
|
|
|
m_handMode->setChecked((m_cursorMode == CursorMode::Hand));
|
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2018-07-26 03:30:51 +12:00
|
|
|
void SchematicViewer::selectModeEnabled() { setCursorMode(CursorMode::Select); }
|
2018-07-20 22:15:22 +12:00
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2018-07-26 03:30:51 +12:00
|
|
|
void SchematicViewer::zoomModeEnabled() { setCursorMode(CursorMode::Zoom); }
|
2018-07-20 22:15:22 +12:00
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
2018-07-26 03:30:51 +12:00
|
|
|
void SchematicViewer::handModeEnabled() { setCursorMode(CursorMode::Hand); }
|
2020-04-17 19:02:53 +12:00
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
|
|
|
void SchematicViewer::deleteFxs() {
|
|
|
|
emit doDeleteFxs(m_fxScene->getFxSelection());
|
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
|
|
|
|
void SchematicViewer::deleteStageObjects() {
|
|
|
|
emit doDeleteStageObjects(m_stageScene->getStageSelection());
|
|
|
|
}
|