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/cpppreprocessordialog.ui | |
| 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/cpppreprocessordialog.ui')
| -rw-r--r-- | src/plugins/cppeditor/cpppreprocessordialog.ui | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/plugins/cppeditor/cpppreprocessordialog.ui b/src/plugins/cppeditor/cpppreprocessordialog.ui index 3860901156..4dbcd968b8 100644 --- a/src/plugins/cppeditor/cpppreprocessordialog.ui +++ b/src/plugins/cppeditor/cpppreprocessordialog.ui @@ -15,34 +15,6 @@ </property> <layout class="QVBoxLayout" name="verticalLayout"> <item> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QLabel" name="projectLabel"> - <property name="text"> - <string>Project:</string> - </property> - </widget> - </item> - <item> - <widget class="QComboBox" name="projectComboBox"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - </item> - </layout> - </item> - <item> - <widget class="Line" name="separator"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> - <item> <widget class="QLabel" name="editorLabel"> <property name="text"> <string>Additional C++ Preprocessor Directives for %1:</string> |