diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index 3bebbc0b8ff..33056bf9bec 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -199,7 +199,7 @@ void DesignModeWidget::enableWidgets() { if (debug) qDebug() << Q_FUNC_INFO; - hideWarningWidget(); + viewManager().enableWidgets(); m_isDisabled = false; } @@ -221,20 +221,6 @@ void DesignModeWidget::switchTextOrForm() m_centralTabWidget->switchTo(viewManager().widget("TextEditor")); } -void DesignModeWidget::showWarningMessageBox(const QList &warnings) -{ - Q_ASSERT(!warnings.isEmpty()); - warningWidget()->setWarnings(warnings); - warningWidget()->setVisible(true); -} - -bool DesignModeWidget::gotoCodeWasClicked() -{ - if (m_warningWidget) - return warningWidget()->gotoCodeWasClicked(); - return false; -} - static void hideToolButtons(QList &buttons) { foreach (QToolButton *button, buttons) @@ -528,28 +514,6 @@ QWidget *DesignModeWidget::createCrumbleBarFrame() return frame; } -DocumentWarningWidget *DesignModeWidget::warningWidget() -{ - if (m_warningWidget.isNull()) { - m_warningWidget = new DocumentWarningWidget(this); - connect(m_warningWidget.data(), &DocumentWarningWidget::gotoCodeClicked, [=] - (const QString &filePath, int codeLine, int codeColumn) { - Q_UNUSED(filePath); - - if (currentDesignDocument() && currentDesignDocument()->textEditor()) - currentDesignDocument()->textEditor()->gotoLine(codeLine, codeColumn); - Core::ModeManager::activateMode(Core::Constants::MODE_EDIT); - }); - } - return m_warningWidget; -} - -void DesignModeWidget::hideWarningWidget() -{ - if (m_warningWidget) - m_warningWidget->setVisible(false); -} - CrumbleBar *DesignModeWidget::crumbleBar() const { return m_crumbleBar; diff --git a/src/plugins/qmldesigner/designmodewidget.h b/src/plugins/qmldesigner/designmodewidget.h index fd37ad48c8c..50a8fd64611 100644 --- a/src/plugins/qmldesigner/designmodewidget.h +++ b/src/plugins/qmldesigner/designmodewidget.h @@ -78,9 +78,6 @@ public: void disableWidgets(); void switchTextOrForm(); - void showWarningMessageBox(const QList &warnings); - bool gotoCodeWasClicked(); - CrumbleBar* crumbleBar() const; void showInternalTextEditor(); @@ -100,12 +97,9 @@ private: // functions void addNavigatorHistoryEntry(const Utils::FileName &fileName); QWidget *createCenterWidget(); QWidget *createCrumbleBarFrame(); - DocumentWarningWidget *warningWidget(); - void hideWarningWidget(); private: // variables QSplitter *m_mainSplitter = nullptr; - QPointer m_warningWidget; SwitchSplitTabWidget* m_centralTabWidget = nullptr; QScopedPointer m_leftSideBar; diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index 366e69bd641..c3c8794e16a 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -329,13 +329,7 @@ void QmlDesignerPlugin::showDesigner() void QmlDesignerPlugin::hideDesigner() { - if (currentDesignDocument() && currentModel()) { - // the message box handle the cursor jump itself - } - if (d->documentManager.hasCurrentDesignDocument()) { - if (currentModel() && !mainWidget()->gotoCodeWasClicked()) - jumpTextCursorToSelectedModelNode(); deactivateAutoSynchronization(); d->mainWidget->saveSettings(); } @@ -417,8 +411,6 @@ void QmlDesignerPlugin::activateAutoSynchronization() selectModelNodeUnderTextCursor(); d->mainWidget->setupNavigatorHistory(currentDesignDocument()->textEditor()); - if (showWarningsForFeaturesInDesigner() && currentDesignDocument()->hasQmlParseWarnings()) - d->mainWidget->showWarningMessageBox(currentDesignDocument()->qmlParseWarnings()); currentDesignDocument()->updateSubcomponentManager(); }