Fixed strings in qmlinspector and shutdown() issues

diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp
index ff5acae..26499f3 100644 (file)
--- a/src/libs/utils/fancymainwindow.cpp
+++ b/src/libs/utils/fancymainwindow.cpp
@@ -62,7 +62,7 @@ FancyMainWindowPrivate::FancyMainWindowPrivate(FancyMainWindow *q) :
     m_menuSeparator1(new QAction(q)),
     m_toggleLockedAction(new QAction(FancyMainWindow::tr("Locked"), q)),
     m_menuSeparator2(new QAction(q)),
-    m_resetLayoutAction(new QAction(FancyMainWindow::tr("Reset to default layout") ,q))
+    m_resetLayoutAction(new QAction(FancyMainWindow::tr("Reset to Default Layout") ,q))
 {
     m_toggleLockedAction->setCheckable(true);
     m_toggleLockedAction->setChecked(m_locked);

diff --git a/src/plugins/qmlinspector/qmlinspector.cpp b/src/plugins/qmlinspector/qmlinspector.cpp
index 23475d0..2d2aba6 100644 (file)
--- a/src/plugins/qmlinspector/qmlinspector.cpp
+++ b/src/plugins/qmlinspector/qmlinspector.cpp
@@ -186,6 +186,11 @@ QmlInspector::QmlInspector(QObject *parent)
 
 QmlInspector::~QmlInspector()
 {
+
+}
+
+void QmlInspector::shutdown()
+{
     m_objectTreeWidget->saveSettings(m_settings);
     m_propertiesWidget->saveSettings(m_settings);
     m_settings.saveSettings(Core::ICore::instance()->settings());
@@ -431,7 +436,7 @@ void QmlInspector::createDockWidgets()
     m_inspectorOutputDock = uiSwitcher->createDockWidget(Qml::Constants::LANG_QML,
                                                             inspectorOutput, Qt::BottomDockWidgetArea);
 
-    m_expressionWidget->setWindowTitle(tr("Script console"));
+    m_expressionWidget->setWindowTitle(tr("Script Console"));
     m_expressionQueryDock = uiSwitcher->createDockWidget(Qml::Constants::LANG_QML,
                                                          m_expressionWidget, Qt::BottomDockWidgetArea);
 

diff --git a/src/plugins/qmlinspector/qmlinspector.h b/src/plugins/qmlinspector/qmlinspector.h
index 691917b..a0ebaa0 100644 (file)
--- a/src/plugins/qmlinspector/qmlinspector.h
+++ b/src/plugins/qmlinspector/qmlinspector.h
@@ -99,6 +99,7 @@ public:
 
     QmlInspector(QObject *parent = 0);
     ~QmlInspector();
+    void shutdown();
 
     void createDockWidgets();
     bool connectToViewer(); // using host, port from widgets

diff --git a/src/plugins/qmlinspector/qmlinspectorplugin.cpp b/src/plugins/qmlinspector/qmlinspectorplugin.cpp
index ec9c8ed..9677557 100644 (file)
--- a/src/plugins/qmlinspector/qmlinspectorplugin.cpp
+++ b/src/plugins/qmlinspector/qmlinspectorplugin.cpp
@@ -86,7 +86,7 @@ QmlInspectorPlugin::~QmlInspectorPlugin()
 
 void QmlInspectorPlugin::aboutToShutdown()
 {
-
+    m_inspector->shutdown();
 }
 
 bool QmlInspectorPlugin::initialize(const QStringList &arguments, QString *errorString)