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

QmlJSEditor: Add option to automatically format QML/JS file on save

Browse Source 
Change-Id: Ide1810efdef98595705daa32c83fecc2ad367a49
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
This commit is contained in:
Michael Dönnebrink
2016-06-18 14:15:02 +02:00
parent 410211e090
commit ed6abae46d
10 changed files with 349 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/qmljseditor/quicktoolbar.cpp
View File

@@ -24,7 +24,7 @@
****************************************************************************/
#include "quicktoolbar.h"
#include "quicktoolbarsettingspage.h"
#include "qmljseditingsettingspage.h"
#include <utils/changeset.h>
#include <qmleditorwidgets/contextpanewidget.h>
@@ -114,7 +114,7 @@ QuickToolBar::~QuickToolBar()
void QuickToolBar::apply(TextEditor::TextEditorWidget *editorWidget, Document::Ptr document, const ScopeChain *scopeChain, Node *node, bool update, bool force)
{
if (!QuickToolBarSettings::get().enableContextPane && !force && !update) {
if (!QmlJsEditingSettings::get().enableContextPane() && !force && !update) {
contextWidget()->hide();
return;
}
@@ -219,10 +219,10 @@ void QuickToolBar::apply(TextEditor::TextEditorWidget *editorWidget, Document::P
if (!update)
contextWidget()->setType(m_prototypes);
if (!update)
contextWidget()->activate(p3 , p1, p2, QuickToolBarSettings::get().pinContextPane);
contextWidget()->activate(p3 , p1, p2, QmlJsEditingSettings::get().pinContextPane());
else
contextWidget()->rePosition(p3 , p1, p2, QuickToolBarSettings::get().pinContextPane);
contextWidget()->setOptions(QuickToolBarSettings::get().enableContextPane, QuickToolBarSettings::get().pinContextPane);
contextWidget()->rePosition(p3 , p1, p2, QmlJsEditingSettings::get().pinContextPane());
contextWidget()->setOptions(QmlJsEditingSettings::get().enableContextPane(), QmlJsEditingSettings::get().pinContextPane());
contextWidget()->setPath(document->path());
contextWidget()->setProperties(&propertyReader);
m_doc = document;
@@ -404,16 +404,16 @@ void QuickToolBar::onPropertyRemovedAndChange(const QString &remove, const QStri
void QuickToolBar::onPinnedChanged(bool b)
{
QuickToolBarSettings settings = QuickToolBarSettings::get();
settings.pinContextPane = b;
QmlJsEditingSettings settings = QmlJsEditingSettings::get();
settings.setPinContextPane(b);
settings.set();
}
void QuickToolBar::onEnabledChanged(bool b)
{
QuickToolBarSettings settings = QuickToolBarSettings::get();
settings.pinContextPane = b;
settings.enableContextPane = b;
QmlJsEditingSettings settings = QmlJsEditingSettings::get();
settings.setPinContextPane(b);
settings.setEnableContextPane(b);
settings.set();
}