Skip to content
Snippets Groups Projects
Commit 68aaf97e authored by Marco Bubke's avatar Marco Bubke
Browse files

Fix crash for uncommented actions

parent 0bb575b1
No related branches found
No related tags found
No related merge requests found
...@@ -62,28 +62,28 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view) ...@@ -62,28 +62,28 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
QList<QAction*> upperActions; QList<QAction*> upperActions;
// m_toolActionGroup = new QActionGroup(this); m_toolActionGroup = new QActionGroup(this);
//
// m_transformToolAction = m_toolActionGroup->addAction("Transform Tool (Press Key Q)"); m_transformToolAction = m_toolActionGroup->addAction("Transform Tool (Press Key Q)");
// m_transformToolAction->setShortcut(Qt::Key_Q); m_transformToolAction->setShortcut(Qt::Key_Q);
// m_transformToolAction->setShortcutContext(Qt::WidgetWithChildrenShortcut); m_transformToolAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
// m_transformToolAction->setCheckable(true); m_transformToolAction->setCheckable(true);
// m_transformToolAction->setChecked(true); m_transformToolAction->setChecked(true);
// m_transformToolAction->setIcon(QPixmap(":/icon/tool/transform.png")); m_transformToolAction->setIcon(QPixmap(":/icon/tool/transform.png"));
// connect(m_transformToolAction.data(), SIGNAL(triggered(bool)), SLOT(changeTransformTool(bool))); connect(m_transformToolAction.data(), SIGNAL(triggered(bool)), SLOT(changeTransformTool(bool)));
//
// m_anchorToolAction = m_toolActionGroup->addAction("Anchor Tool (Press Key W)"); m_anchorToolAction = m_toolActionGroup->addAction("Anchor Tool (Press Key W)");
// m_anchorToolAction->setShortcut(Qt::Key_W); m_anchorToolAction->setShortcut(Qt::Key_W);
// m_anchorToolAction->setShortcutContext(Qt::WidgetWithChildrenShortcut); m_anchorToolAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
// m_anchorToolAction->setCheckable(true); m_anchorToolAction->setCheckable(true);
// m_anchorToolAction->setIcon(QPixmap(":/icon/tool/anchor.png")); m_anchorToolAction->setIcon(QPixmap(":/icon/tool/anchor.png"));
// connect(m_anchorToolAction.data(), SIGNAL(triggered(bool)), SLOT(changeAnchorTool(bool))); connect(m_anchorToolAction.data(), SIGNAL(triggered(bool)), SLOT(changeAnchorTool(bool)));
//
// addActions(m_toolActionGroup->actions()); // addActions(m_toolActionGroup->actions());
// upperActions.append(m_toolActionGroup->actions()); // upperActions.append(m_toolActionGroup->actions());
//
// QAction *separatorAction = new QAction(this); QAction *separatorAction = new QAction(this);
// separatorAction->setSeparator(true); separatorAction->setSeparator(true);
// addAction(separatorAction); // addAction(separatorAction);
// upperActions.append(separatorAction); // upperActions.append(separatorAction);
...@@ -97,12 +97,14 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view) ...@@ -97,12 +97,14 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
m_snappingAction->setChecked(true); m_snappingAction->setChecked(true);
m_snappingAction->setIcon(QPixmap(":/icon/layout/snapping.png")); m_snappingAction->setIcon(QPixmap(":/icon/layout/snapping.png"));
// m_snappingAndAnchoringAction = layoutActionGroup->addAction("Toogle Snapping And Anchoring (Press Key R)"); m_snappingAndAnchoringAction = layoutActionGroup->addAction("Toogle Snapping And Anchoring (Press Key R)");
// m_snappingAndAnchoringAction->setShortcut(Qt::Key_R); m_snappingAndAnchoringAction->setShortcut(Qt::Key_R);
// m_snappingAndAnchoringAction->setShortcutContext(Qt::WidgetWithChildrenShortcut); m_snappingAndAnchoringAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
// m_snappingAndAnchoringAction->setCheckable(true); m_snappingAndAnchoringAction->setCheckable(true);
// m_snappingAndAnchoringAction->setChecked(false); m_snappingAndAnchoringAction->setChecked(false);
// m_snappingAndAnchoringAction->setIcon(QPixmap(":/icon/layout/snapping_and_anchoring.png")); m_snappingAndAnchoringAction->setEnabled(false);
m_snappingAndAnchoringAction->setVisible(false);
m_snappingAndAnchoringAction->setIcon(QPixmap(":/icon/layout/snapping_and_anchoring.png"));
m_noSnappingAction = layoutActionGroup->addAction("Toogle Snapping And Anchoring (Press Key T)"); m_noSnappingAction = layoutActionGroup->addAction("Toogle Snapping And Anchoring (Press Key T)");
m_noSnappingAction->setShortcut(Qt::Key_T); m_noSnappingAction->setShortcut(Qt::Key_T);
...@@ -114,7 +116,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view) ...@@ -114,7 +116,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
addActions(layoutActionGroup->actions()); addActions(layoutActionGroup->actions());
upperActions.append(layoutActionGroup->actions()); upperActions.append(layoutActionGroup->actions());
QAction *separatorAction = new QAction(this); separatorAction = new QAction(this);
separatorAction->setSeparator(true); separatorAction->setSeparator(true);
addAction(separatorAction); addAction(separatorAction);
upperActions.append(separatorAction); upperActions.append(separatorAction);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment