summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Palettes
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2018-09-18 14:27:19 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2018-09-19 07:53:07 +0000
commitdb2cc087da3453066180b45df03ca36777670d0a (patch)
treeed171d80669803bb28e53259c348cc556d95a97e /src/Authoring/Studio/Palettes
parent8dd70dd8db835816bf919a00bb8d41a76a05220f (diff)
Fix toggle shy/locked for multiple selected objects
Task-number: QT3DS-2354 Change-Id: Ie108b336a24f889607e12d46984dcf686d099ee4 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes')
-rw-r--r--src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineGraphicsScene.cpp18
-rw-r--r--src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineGraphicsScene.h2
2 files changed, 2 insertions, 18 deletions
diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineGraphicsScene.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineGraphicsScene.cpp
index 506d2484..1d58fd9c 100644
--- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineGraphicsScene.cpp
+++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineGraphicsScene.cpp
@@ -325,13 +325,13 @@ TimelineGraphicsScene::TimelineGraphicsScene(TimelineWidget *timelineWidget)
action = new QAction(this);
action->setShortcut(QKeySequence(Qt::ShiftModifier | Qt::Key_H));
action->setShortcutContext(Qt::ApplicationShortcut);
- connect(action, &QAction::triggered, this, &TimelineGraphicsScene::handleShySelected);
+ connect(action, &QAction::triggered, &g_StudioApp, &CStudioApp::toggleShy);
timelineWidget->addAction(action);
action = new QAction(this);
action->setShortcut(QKeySequence(Qt::ControlModifier | Qt::Key_H));
action->setShortcutContext(Qt::ApplicationShortcut);
- connect(action, &QAction::triggered, this, &TimelineGraphicsScene::handleLockSelected);
+ connect(action, &QAction::triggered, &g_StudioApp, &CStudioApp::toggleLocked);
timelineWidget->addAction(action);
}
@@ -1041,20 +1041,6 @@ void TimelineGraphicsScene::handleEditComponent()
}
}
-void TimelineGraphicsScene::handleShySelected()
-{
- RowTree *selectedRow = m_rowManager->selectedRow();
- if (selectedRow)
- selectedRow->toggleShy();
-}
-
-void TimelineGraphicsScene::handleLockSelected()
-{
- RowTree *selectedRow = m_rowManager->selectedRow();
- if (selectedRow)
- selectedRow->toggleLocked();
-}
-
void TimelineGraphicsScene::handleApplicationFocusLoss()
{
// Hide the timebar tooltip if application loses focus
diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineGraphicsScene.h b/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineGraphicsScene.h
index e452c12b..bf02d3bb 100644
--- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineGraphicsScene.h
+++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineGraphicsScene.h
@@ -116,8 +116,6 @@ private:
void handleMakeComponent();
void handleCopyObjectPath();
void handleEditComponent();
- void handleShySelected();
- void handleLockSelected();
void handleApplicationFocusLoss();
QGraphicsLinearLayout *m_layoutRoot;