diff options
author | Martin Smith <martin.smith@nokia.com> | 2011-02-24 10:48:32 (GMT) |
---|---|---|
committer | Martin Smith <martin.smith@nokia.com> | 2011-02-24 10:48:32 (GMT) |
commit | e51fda7db531628b54297ae020dda4a5f962d394 (patch) | |
tree | 846fa261f80459529235e890ed897cf6186e9351 /tools/qml/loggerwidget.cpp | |
parent | 66aba9ad196c24d6844e39901bf152d0951ccfb7 (diff) | |
parent | c881e33e7e510204fabd061dac08a00b10b432fb (diff) | |
download | Qt-e51fda7db531628b54297ae020dda4a5f962d394.zip Qt-e51fda7db531628b54297ae020dda4a5f962d394.tar.gz Qt-e51fda7db531628b54297ae020dda4a5f962d394.tar.bz2 |
Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimir
Diffstat (limited to 'tools/qml/loggerwidget.cpp')
-rw-r--r-- | tools/qml/loggerwidget.cpp | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/tools/qml/loggerwidget.cpp b/tools/qml/loggerwidget.cpp index 8aa029f..3f2337a 100644 --- a/tools/qml/loggerwidget.cpp +++ b/tools/qml/loggerwidget.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -45,6 +45,8 @@ #include <QActionGroup> #include <QMenu> #include <QPlainTextEdit> +#include <QLabel> +#include <QVBoxLayout> #ifdef Q_WS_MAEMO_5 # include <QScrollArea> # include <QVBoxLayout> @@ -64,6 +66,19 @@ LoggerWidget::LoggerWidget(QWidget *parent) : m_plainTextEdit = new QPlainTextEdit(); +#if defined(Q_OS_SYMBIAN) + QAction* clearAction = new QAction(tr("Clear"), this); + clearAction->setSoftKeyRole(QAction::PositiveSoftKey); + connect(clearAction, SIGNAL(triggered()), m_plainTextEdit, SLOT(clear())); + addAction(clearAction); + + m_plainTextEdit->setReadOnly(true); + QAction* backAction = new QAction( tr("Back"), this ); + backAction->setSoftKeyRole( QAction::NegativeSoftKey ); + connect(backAction, SIGNAL(triggered()), this, SLOT(hide())); + addAction( backAction ); +#endif + #ifdef Q_WS_MAEMO_5 new TextEditAutoResizer(m_plainTextEdit); setAttribute(Qt::WA_Maemo5StackedWindow); @@ -74,6 +89,15 @@ LoggerWidget::LoggerWidget(QWidget *parent) : #else setCentralWidget(m_plainTextEdit); #endif + + m_noWarningsLabel = new QLabel(m_plainTextEdit); + m_noWarningsLabel->setText(tr("(No warnings)")); + m_noWarningsLabel->setAlignment(Qt::AlignVCenter | Qt::AlignHCenter); + QVBoxLayout *layout = new QVBoxLayout; + layout->addWidget(m_noWarningsLabel); + m_plainTextEdit->setLayout(layout); + connect(m_plainTextEdit, SIGNAL(textChanged()), this, SLOT(updateNoWarningsLabel())); + readSettings(); setupPreferencesMenu(); } @@ -198,4 +222,9 @@ void LoggerWidget::setupPreferencesMenu() } } +void LoggerWidget::updateNoWarningsLabel() +{ + m_noWarningsLabel->setVisible(m_plainTextEdit->toPlainText().length() == 0); +} + QT_END_NAMESPACE |