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

QmlDesigner: Polish error handling for integrated text editor

Browse Source 
The integrated text editor requires a couple of fixes and features
in the error handling.

The errors are now handled by the model and not the document management
anymore.
The text editor does not get disabled if there is an error. Instead
we show the error in a status bar.
The form editor is blocked if there is a QML an error and we show the
error message inside the form editor.

Change-Id: I4bfb9b33b09e444ec1de31dd531ce83b32cbcf88
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2017-01-10 16:36:55 +01:00
committed by Tim Jenssen
parent 8b67458a95
commit 759db2b7b6
30 changed files with 383 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/plugins/qmldesigner/components/texteditor/texteditorstatusbar.cpp Normal file
View File

@@ -0,0 +1,56 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#include "texteditorstatusbar.h"
#include <utils/theme/theme.h>
#include <QVBoxLayout>
namespace QmlDesigner {
TextEditorStatusBar::TextEditorStatusBar(QWidget *parent) : QToolBar(parent), m_label(new QLabel(this))
{
QWidget *spacer = new QWidget(this);
spacer->setMinimumWidth(50);
addWidget(spacer);
addWidget(m_label);
/* We have to set another .css, since the central widget has already a style sheet */
m_label->setStyleSheet(QString("QLabel { color :%1 }").arg(Utils::creatorTheme()->color(Utils::Theme::TextColorError).name()));
}
void TextEditorStatusBar::clearText()
{
m_label->clear();
}
void TextEditorStatusBar::setText(const QString &text)
{
m_label->setText(text);
}
} // namespace QmlDesigner