feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Add timelineeditor to build

Browse Source 
Change-Id: I0ed2b71fead11bd94d7e9379e6c02a797d7a6901
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Thomas Hartmann
2019-01-30 14:59:39 +01:00
parent b0d5dd8d4b
commit c7f2002671
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmldesigner/designersettings.cpp
View File

@@ -75,6 +75,7 @@ void DesignerSettings::fromSettings(QSettings *settings)
restoreValue(settings, DesignerSettingsKey::STATESEDITOR_EXPANDED, true); restoreValue(settings, DesignerSettingsKey::STATESEDITOR_EXPANDED, true);
restoreValue(settings, DesignerSettingsKey::NAVIGATOR_SHOW_ONLY_VISIBLE_ITEMS, true); restoreValue(settings, DesignerSettingsKey::NAVIGATOR_SHOW_ONLY_VISIBLE_ITEMS, true);
restoreValue(settings, DesignerSettingsKey::STANDALONE_MODE, false); restoreValue(settings, DesignerSettingsKey::STANDALONE_MODE, false);
restoreValue(settings, DesignerSettingsKey::ENABLE_TIMELINEVIEW, false);
settings->endGroup(); settings->endGroup();
settings->endGroup(); settings->endGroup();

1
src/plugins/qmldesigner/designersettings.h
View File

@@ -64,6 +64,7 @@ const char NAVIGATOR_SHOW_ONLY_VISIBLE_ITEMS[] = "NavigatorShowOnlyVisibleItems"
const char REFORMAT_UI_QML_FILES[] = "ReformatUiQmlFiles"; /* These settings are not exposed in ui. */ const char REFORMAT_UI_QML_FILES[] = "ReformatUiQmlFiles"; /* These settings are not exposed in ui. */
const char IGNORE_DEVICE_PIXEL_RATIO[] = "IgnoreDevicePixelRaio"; /* The settings can be used to turn off the feature, if there are serious issues */ const char IGNORE_DEVICE_PIXEL_RATIO[] = "IgnoreDevicePixelRaio"; /* The settings can be used to turn off the feature, if there are serious issues */
const char STANDALONE_MODE[] = "StandAloneMode"; const char STANDALONE_MODE[] = "StandAloneMode";
const char ENABLE_TIMELINEVIEW[] = "EnableTimelineView";
} }
class DesignerSettings : public QHash<QByteArray, QVariant> class DesignerSettings : public QHash<QByteArray, QVariant>

4
src/plugins/qmldesigner/qmldesignerextension/qmldesignerextension.pri
View File

@@ -8,7 +8,5 @@ include(sourcetool/sourcetool.pri)
include(colortool/colortool.pri) include(colortool/colortool.pri)
include(texttool/texttool.pri) include(texttool/texttool.pri)
include(pathtool/pathtool.pri) include(pathtool/pathtool.pri)
include(timelineeditor/timelineeditor.pri)
include(connectioneditor/connectioneditor.pri) include(connectioneditor/connectioneditor.pri)

2
src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineeditor.pri
View File

@@ -18,7 +18,6 @@ SOURCES += \
timelineabstracttool.cpp \ timelineabstracttool.cpp \
timelinemovetool.cpp \ timelinemovetool.cpp \
timelineselectiontool.cpp \ timelineselectiontool.cpp \
timelineplugin.cpp \
timelineplaceholder.cpp \ timelineplaceholder.cpp \
setframevaluedialog.cpp \ setframevaluedialog.cpp \
timelinetoolbar.cpp \ timelinetoolbar.cpp \
@@ -52,7 +51,6 @@ HEADERS += \
timelineabstracttool.h \ timelineabstracttool.h \
timelinemovetool.h \ timelinemovetool.h \
timelineselectiontool.h \ timelineselectiontool.h \
timelineplugin.h \
timelineplaceholder.h \ timelineplaceholder.h \
timelineicons.h \ timelineicons.h \
timelinetoolbar.h \ timelinetoolbar.h \

5
src/plugins/qmldesigner/qmldesignerplugin.cpp
View File

@@ -36,6 +36,7 @@
#include <sourcetool/sourcetool.h> #include <sourcetool/sourcetool.h>
#include <colortool/colortool.h> #include <colortool/colortool.h>
#include <texttool/texttool.h> #include <texttool/texttool.h>
#include <timelineeditor/timelineview.h>
#include <pathtool/pathtool.h> #include <pathtool/pathtool.h>
#include <qmljseditor/qmljseditorconstants.h> #include <qmljseditor/qmljseditorconstants.h>
@@ -192,7 +193,9 @@ bool QmlDesignerPlugin::delayedInitialize()
d->settings.fromSettings(Core::ICore::settings()); d->settings.fromSettings(Core::ICore::settings());
d->viewManager.registerViewTakingOwnership(new QmlDesigner::Internal::ConnectionView()); d->viewManager.registerViewTakingOwnership(new QmlDesigner::Internal::ConnectionView);
if (DesignerSettings::getValue(DesignerSettingsKey::ENABLE_TIMELINEVIEW).toBool())
d->viewManager.registerViewTakingOwnership(new QmlDesigner::TimelineView);
d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::SourceTool); d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::SourceTool);
d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::ColorTool); d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::ColorTool);
d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::TextTool); d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::TextTool);