summaryrefslogtreecommitdiff
path: root/src/plugins/texteditor/displaysettingspage.cpp
diff options
context:
space:
mode:
authorDavid Schulz <david.schulz@qt.io>2017-06-20 08:28:10 +0200
committerDavid Schulz <david.schulz@qt.io>2017-06-30 08:27:16 +0000
commit6591a01452918ce40ca101bb6cfe9770a44d16be (patch)
tree66d0c53e2dbd89126f063897453dc3aef65c216b /src/plugins/texteditor/displaysettingspage.cpp
parent4506acbffc08cab4ad2a4f0425fd62c0e0a03f1b (diff)
downloadqt-creator-6591a01452918ce40ca101bb6cfe9770a44d16be.tar.gz
TextEditor: Add line annotations
Displaying short descriptive text of a TextMark at line end. Currently implemented for ClangTextMark and BookMark. Change-Id: Idc6b579bda0382ad94b2e236b715696396b10460 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/texteditor/displaysettingspage.cpp')
-rw-r--r--src/plugins/texteditor/displaysettingspage.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/texteditor/displaysettingspage.cpp b/src/plugins/texteditor/displaysettingspage.cpp
index 147fa97080..7ae27e11d7 100644
--- a/src/plugins/texteditor/displaysettingspage.cpp
+++ b/src/plugins/texteditor/displaysettingspage.cpp
@@ -119,6 +119,7 @@ void DisplaySettingsPage::settingsFromUI(DisplaySettings &displaySettings,
displaySettings.m_displayFileEncoding = d->m_page->displayFileEncoding->isChecked();
displaySettings.m_scrollBarHighlights = d->m_page->scrollBarHighlights->isChecked();
displaySettings.m_animateNavigationWithinFile = d->m_page->animateNavigationWithinFile->isChecked();
+ displaySettings.m_displayAnnotations = d->m_page->displayAnnotations->isChecked();
}
void DisplaySettingsPage::settingsToUI()
@@ -142,6 +143,7 @@ void DisplaySettingsPage::settingsToUI()
d->m_page->displayFileEncoding->setChecked(displaySettings.m_displayFileEncoding);
d->m_page->scrollBarHighlights->setChecked(displaySettings.m_scrollBarHighlights);
d->m_page->animateNavigationWithinFile->setChecked(displaySettings.m_animateNavigationWithinFile);
+ d->m_page->displayAnnotations->setChecked(displaySettings.m_displayAnnotations);
}
const DisplaySettings &DisplaySettingsPage::displaySettings() const