forked from qt-creator/qt-creator
Fixed strings in qmlinspector and shutdown() issues
This commit is contained in:
@@ -62,7 +62,7 @@ FancyMainWindowPrivate::FancyMainWindowPrivate(FancyMainWindow *q) :
|
|||||||
m_menuSeparator1(new QAction(q)),
|
m_menuSeparator1(new QAction(q)),
|
||||||
m_toggleLockedAction(new QAction(FancyMainWindow::tr("Locked"), q)),
|
m_toggleLockedAction(new QAction(FancyMainWindow::tr("Locked"), q)),
|
||||||
m_menuSeparator2(new QAction(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->setCheckable(true);
|
||||||
m_toggleLockedAction->setChecked(m_locked);
|
m_toggleLockedAction->setChecked(m_locked);
|
||||||
|
|||||||
@@ -185,6 +185,11 @@ QmlInspector::QmlInspector(QObject *parent)
|
|||||||
}
|
}
|
||||||
|
|
||||||
QmlInspector::~QmlInspector()
|
QmlInspector::~QmlInspector()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void QmlInspector::shutdown()
|
||||||
{
|
{
|
||||||
m_objectTreeWidget->saveSettings(m_settings);
|
m_objectTreeWidget->saveSettings(m_settings);
|
||||||
m_propertiesWidget->saveSettings(m_settings);
|
m_propertiesWidget->saveSettings(m_settings);
|
||||||
@@ -431,7 +436,7 @@ void QmlInspector::createDockWidgets()
|
|||||||
m_inspectorOutputDock = uiSwitcher->createDockWidget(Qml::Constants::LANG_QML,
|
m_inspectorOutputDock = uiSwitcher->createDockWidget(Qml::Constants::LANG_QML,
|
||||||
inspectorOutput, Qt::BottomDockWidgetArea);
|
inspectorOutput, Qt::BottomDockWidgetArea);
|
||||||
|
|
||||||
m_expressionWidget->setWindowTitle(tr("Script console"));
|
m_expressionWidget->setWindowTitle(tr("Script Console"));
|
||||||
m_expressionQueryDock = uiSwitcher->createDockWidget(Qml::Constants::LANG_QML,
|
m_expressionQueryDock = uiSwitcher->createDockWidget(Qml::Constants::LANG_QML,
|
||||||
m_expressionWidget, Qt::BottomDockWidgetArea);
|
m_expressionWidget, Qt::BottomDockWidgetArea);
|
||||||
|
|
||||||
|
|||||||
@@ -99,6 +99,7 @@ public:
|
|||||||
|
|
||||||
QmlInspector(QObject *parent = 0);
|
QmlInspector(QObject *parent = 0);
|
||||||
~QmlInspector();
|
~QmlInspector();
|
||||||
|
void shutdown();
|
||||||
|
|
||||||
void createDockWidgets();
|
void createDockWidgets();
|
||||||
bool connectToViewer(); // using host, port from widgets
|
bool connectToViewer(); // using host, port from widgets
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ QmlInspectorPlugin::~QmlInspectorPlugin()
|
|||||||
|
|
||||||
void QmlInspectorPlugin::aboutToShutdown()
|
void QmlInspectorPlugin::aboutToShutdown()
|
||||||
{
|
{
|
||||||
|
m_inspector->shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool QmlInspectorPlugin::initialize(const QStringList &arguments, QString *errorString)
|
bool QmlInspectorPlugin::initialize(const QStringList &arguments, QString *errorString)
|
||||||
|
|||||||
Reference in New Issue
Block a user