aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/components/stateseditor
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2017-01-19 09:44:13 +0100
committerTim Jenssen <tim.jenssen@qt.io>2017-01-19 10:26:21 +0000
commitd5ac800b90ca8f12682c68530938c7490d0fe052 (patch)
tree8d0eae745a52298c6e82964494c69e1297d0873e /src/plugins/qmldesigner/components/stateseditor
parent58e7554f3d2f00bb3a65205274bfd0f73c491818 (diff)
QmlDesigner: Hook up states editor expanded state to command
The expanded/collpased state of the states editor is now hooked up to a Qt Creator command. This means there is a configurable shortcurt and an entry in the menu under Windows/Views. Change-Id: Ied993870fe605cfd6651b203986b009620c98f1b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/components/stateseditor')
-rw-r--r--src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp6
-rw-r--r--src/plugins/qmldesigner/components/stateseditor/stateseditorview.h2
-rw-r--r--src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp6
-rw-r--r--src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h2
4 files changed, 16 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
index 8af913b6483..095e2295923 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
@@ -74,6 +74,12 @@ void StatesEditorView::rootNodeTypeChanged(const QString &/*type*/, int /*majorV
checkForWindow();
}
+void StatesEditorView::toggleStatesViewExpanded()
+{
+ if (m_statesEditorWidget)
+ m_statesEditorWidget->toggleStatesViewExpanded();
+}
+
void StatesEditorView::removeState(int nodeId)
{
try {
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h
index a17a8d80162..8038f0cd880 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h
@@ -80,6 +80,8 @@ public:
void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override;
+ void toggleStatesViewExpanded();
+
public slots:
void synchonizeCurrentStateFromWidget();
void createNewState();
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
index a9a96cf05d2..04d658f9b7c 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
@@ -117,6 +117,12 @@ QString StatesEditorWidget::qmlSourcesPath() {
return Core::ICore::resourcePath() + QStringLiteral("/qmldesigner/statesEditorQmlSources");
}
+void StatesEditorWidget::toggleStatesViewExpanded()
+{
+ bool expanded = rootObject()->property("expanded").toBool();
+ rootObject()->setProperty("expanded", !expanded);
+}
+
void StatesEditorWidget::reloadQmlSource()
{
QString statesListQmlFilePath = qmlSourcesPath() + QStringLiteral("/StatesList.qml");
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h
index fc78ecb4501..474f81bbe31 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h
@@ -59,6 +59,8 @@ public:
static QString qmlSourcesPath();
+ void toggleStatesViewExpanded();
+
private slots:
void reloadQmlSource();
void changeHeight();