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

Hide broken "Apply on Save" feature

Browse Source 
The feature has always been somewhat experimental, but got even more
broken over time. Let's hide it for the time being.

Change-Id: If46861831d7fb7ed8e9b77b79d1ebe583243ab48
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Kai Koehne
2014-07-17 12:14:14 +02:00
committed by hjk
parent a1b5a61b6e
commit ac771eb552
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/src/debugger/qtquick-debugging.qdoc
View File

@@ -167,12 +167,17 @@
\section1 Applying QML Changes at Runtime \section1 Applying QML Changes at Runtime
\omit
// currently broken & disabled
If you change property values or add properties in the code editor, the If you change property values or add properties in the code editor, the
debugger can update the properties in the running application when you save debugger can update the properties in the running application when you save
the file. This is enabled by default. To disable it, click the the file. This is enabled by default. To disable it, click the
\inlineimage qml-observer-bar-reload.png "Apply Changes on Save button" \inlineimage qml-observer-bar-reload.png "Apply Changes on Save button"
(\gui {Apply Changes on Save}) button on the toolbar. (\gui {Apply Changes on Save}) button on the toolbar.
\endomit
When you change property values in the \gui {QML/JS Console} or in the When you change property values in the \gui {QML/JS Console} or in the
\gui {Locals and Expressions} view, they are immediately updated in the running \gui {Locals and Expressions} view, they are immediately updated in the running
application, but not in the source code. application, but not in the source code.

18
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -3197,13 +3197,14 @@ void DebuggerPluginPrivate::extensionsInitialized()
debugMenu->addSeparator(globalcontext); debugMenu->addSeparator(globalcontext);
QAction *qmlUpdateOnSaveDummyAction = new QAction(tr("Apply Changes on Save"), this); // currently broken
qmlUpdateOnSaveDummyAction->setCheckable(true); // QAction *qmlUpdateOnSaveDummyAction = new QAction(tr("Apply Changes on Save"), this);
qmlUpdateOnSaveDummyAction->setIcon(QIcon(_(":/debugger/images/qml/apply-on-save.png"))); // qmlUpdateOnSaveDummyAction->setCheckable(true);
qmlUpdateOnSaveDummyAction->setEnabled(false); // qmlUpdateOnSaveDummyAction->setIcon(QIcon(_(":/debugger/images/qml/apply-on-save.png")));
cmd = ActionManager::registerAction(qmlUpdateOnSaveDummyAction, Constants::QML_UPDATE_ON_SAVE, // qmlUpdateOnSaveDummyAction->setEnabled(false);
globalcontext); // cmd = ActionManager::registerAction(qmlUpdateOnSaveDummyAction, Constants::QML_UPDATE_ON_SAVE,
debugMenu->addAction(cmd); // globalcontext);
// debugMenu->addAction(cmd);
QAction *qmlShowAppOnTopDummyAction = new QAction(tr("Show Application on Top"), this); QAction *qmlShowAppOnTopDummyAction = new QAction(tr("Show Application on Top"), this);
qmlShowAppOnTopDummyAction->setCheckable(true); qmlShowAppOnTopDummyAction->setCheckable(true);
@@ -3358,7 +3359,8 @@ void DebuggerPluginPrivate::extensionsInitialized()
hbox = new QHBoxLayout(qmlToolbar); hbox = new QHBoxLayout(qmlToolbar);
hbox->setMargin(0); hbox->setMargin(0);
hbox->setSpacing(0); hbox->setSpacing(0);
hbox->addWidget(toolButton(Constants::QML_UPDATE_ON_SAVE)); // currently broken
//hbox->addWidget(toolButton(Constants::QML_UPDATE_ON_SAVE));
hbox->addWidget(toolButton(Constants::QML_SHOW_APP_ON_TOP)); hbox->addWidget(toolButton(Constants::QML_SHOW_APP_ON_TOP));
hbox->addWidget(new StyledSeparator); hbox->addWidget(new StyledSeparator);
hbox->addWidget(toolButton(Constants::QML_SELECTTOOL)); hbox->addWidget(toolButton(Constants::QML_SELECTTOOL));