From 934a8238d4937f5bcf1dd22692c07d455af34506 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jkobus@trolltech.com>
Date: Wed, 25 May 2011 08:50:01 +0200
Subject: Implement qml tab settings

Change-Id: I0b7365b5b3d7538f2b4a8c5eaff3420f448dd5be
Reviewed-on: http://codereview.qt.nokia.com/99
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
---
 src/plugins/qmljstools/qmljstoolsplugin.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/plugins/qmljstools/qmljstoolsplugin.cpp')

diff --git a/src/plugins/qmljstools/qmljstoolsplugin.cpp b/src/plugins/qmljstools/qmljstoolsplugin.cpp
index 322070c93e..5e750bc8e8 100644
--- a/src/plugins/qmljstools/qmljstoolsplugin.cpp
+++ b/src/plugins/qmljstools/qmljstoolsplugin.cpp
@@ -36,9 +36,12 @@
 #include "qmljslocatordata.h"
 #include "qmljscodestylesettingspage.h"
 #include "qmljstoolsconstants.h"
+#include "qmljstoolssettings.h"
+#include "qmljscodestylesettingsfactory.h"
 
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/tabsettings.h>
+#include <texteditor/codestylepreferencesmanager.h>
 
 #include <extensionsystem/pluginmanager.h>
 
@@ -74,6 +77,8 @@ bool QmlJSToolsPlugin::initialize(const QStringList &arguments, QString *error)
     Q_UNUSED(error)
 //    Core::ICore *core = Core::ICore::instance();
 
+    m_settings = new QmlJSToolsSettings(this); // force registration of qmljstools settings
+
     // Objects
     m_modelManager = new ModelManager(this);
 //    Core::VCSManager *vcsManager = core->vcsManager();
@@ -87,7 +92,10 @@ bool QmlJSToolsPlugin::initialize(const QStringList &arguments, QString *error)
     LocatorData *locatorData = new LocatorData;
     addAutoReleasedObject(locatorData);
     addAutoReleasedObject(new FunctionFilter(locatorData));
-//    addAutoReleasedObject(new QmlJSCodeStyleSettingsPage);
+    addAutoReleasedObject(new QmlJSCodeStyleSettingsPage);
+
+    TextEditor::CodeStylePreferencesManager::instance()->registerFactory(
+                new QmlJSTools::QmlJSCodeStylePreferencesFactory());
 
     return true;
 }
-- 
cgit v1.2.1