diff options
| author | Lorenz Haas <lykurg@gmail.com> | 2013-04-18 10:06:13 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@digia.com> | 2013-04-18 15:53:53 +0200 |
| commit | 7d2a7685aa088773d1f86d07d374c173aa2efc4d (patch) | |
| tree | aa58916cd4780fb3af799cbcfa1b6e9b8697c247 /src/plugins/texteditor/displaysettingspage.cpp | |
| parent | 63a04e0c1550cc112f7c46f148a5a5c44af06a32 (diff) | |
| download | qt-creator-7d2a7685aa088773d1f86d07d374c173aa2efc4d.tar.gz | |
Editor: Show file encoding in editor toolbar
The file encoding is shown next to the current line in the toolbar. If
the label is clicked a dialog for encoding selection is shown.
Task-number: QTCREATORBUG-8376
Change-Id: I9adee76a31929de5f698d14fe5ca5abce3cc4633
Reviewed-by: David Schulz <david.schulz@digia.com>
Diffstat (limited to 'src/plugins/texteditor/displaysettingspage.cpp')
| -rw-r--r-- | src/plugins/texteditor/displaysettingspage.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/texteditor/displaysettingspage.cpp b/src/plugins/texteditor/displaysettingspage.cpp index 3820f4f913..b5470e8ea0 100644 --- a/src/plugins/texteditor/displaysettingspage.cpp +++ b/src/plugins/texteditor/displaysettingspage.cpp @@ -85,7 +85,8 @@ QWidget *DisplaySettingsPage::createPage(QWidget *parent) << ' ' << d->m_page->enableTextWrapping->text() << ' ' << d->m_page->autoFoldFirstComment->text() << ' ' << d->m_page->centerOnScroll->text() - << ' ' << d->m_page->openLinksInNextSplit->text(); + << ' ' << d->m_page->openLinksInNextSplit->text() + << ' ' << d->m_page->displayFileEncoding->text(); d->m_searchKeywords.remove(QLatin1Char('&')); } return w; @@ -125,6 +126,7 @@ void DisplaySettingsPage::settingsFromUI(DisplaySettings &displaySettings) const displaySettings.m_autoFoldFirstComment = d->m_page->autoFoldFirstComment->isChecked(); displaySettings.m_centerCursorOnScroll = d->m_page->centerOnScroll->isChecked(); displaySettings.m_openLinksInNextSplit = d->m_page->openLinksInNextSplit->isChecked(); + displaySettings.m_displayFileEncoding = d->m_page->displayFileEncoding->isChecked(); } void DisplaySettingsPage::settingsToUI() @@ -144,6 +146,7 @@ void DisplaySettingsPage::settingsToUI() d->m_page->autoFoldFirstComment->setChecked(displaySettings.m_autoFoldFirstComment); d->m_page->centerOnScroll->setChecked(displaySettings.m_centerCursorOnScroll); d->m_page->openLinksInNextSplit->setChecked(displaySettings.m_openLinksInNextSplit); + d->m_page->displayFileEncoding->setChecked(displaySettings.m_displayFileEncoding); } const DisplaySettings &DisplaySettingsPage::displaySettings() const |