diff options
author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-01-18 15:05:46 +0100 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-02-03 11:58:27 +0000 |
commit | 38ba61ec4fda2414f44c50d59ff3683ec0ec3b33 (patch) | |
tree | 7519366c206a9d71afbc9ec88d8bf8884e74b4d1 /src/plugins/cppeditor/cppparsecontext.h | |
parent | 9ac96339ffb44b0db3a8f8e96138b6aa08e5693f (diff) |
CppEditor: Rework showing/switching parse configurations
* Move the combox box for switching the parse configurations out of the
"Additional Preprocessor Directives" dialog ('#'-button) to make it
better visible/accessible. Also, decouple the extra preprocessor
directives from the concrete parse context since this is not anymore
in same dialog.
* The combo box appears only if multiple parse configurations are
available for a file.
* The first time multiple parse configurations are detected, an info bar
is shown that points the user to the combox box. A "Do Not Show Again"
button is provided.
* Upon selecting an entry, the preferred parse configuration is saved as
part of the session. The setting can be cleared with the context menu
entry on the combo box.
Follow-up changes need to ensure that the display name and/or tooltip is
unambiguous, e.g. for qbs and cmake projects.
Change-Id: I9e9773704187291524ad7b605bfdddd83ef5b19d
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/cppeditor/cppparsecontext.h')
-rw-r--r-- | src/plugins/cppeditor/cppparsecontext.h | 83 |
1 files changed, 83 insertions, 0 deletions
diff --git a/src/plugins/cppeditor/cppparsecontext.h b/src/plugins/cppeditor/cppparsecontext.h new file mode 100644 index 0000000000..4c6cc95e9d --- /dev/null +++ b/src/plugins/cppeditor/cppparsecontext.h @@ -0,0 +1,83 @@ +/**************************************************************************** +** +** Copyright (C) 2017 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. +** +****************************************************************************/ + +#pragma once + +#include <cpptools/cpptools_utils.h> + +#include <QAbstractListModel> +#include <QComboBox> + +namespace CppEditor { +namespace Internal { + +class ParseContextModel : public QAbstractListModel +{ + Q_OBJECT + +public: + void update(const CppTools::ProjectPartInfo &projectPartInfo); + + void setPreferred(int index); + void clearPreferred(); + + int currentIndex() const; + bool isCurrentPreferred() const; + + QString currentId() const; + QString currentToolTip() const; + + bool areMultipleAvailable() const; + +signals: + void updated(bool areMultipleAvailable); + void preferredParseContextChanged(const QString &id); + +private: + void reset(const CppTools::ProjectPartInfo &projectPartInfo); + int rowCount(const QModelIndex &parent) const override; + QVariant data(const QModelIndex &index, int role) const override; + +private: + CppTools::ProjectPartInfo::Hints m_hints; + QList<CppTools::ProjectPart::Ptr> m_projectParts; + int m_currentIndex = -1; +}; + +class ParseContextWidget : public QComboBox +{ + Q_OBJECT + +public: + ParseContextWidget(ParseContextModel &parseContextModel, QWidget *parent); + void syncToModel(); + +private: + ParseContextModel &m_parseContextModel; + QAction *m_clearPreferredAction = nullptr; +}; + +} // namespace Internal +} // namespace CppEditor |