feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Editor: Show file encoding in editor toolbar

Browse Source 
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>
This commit is contained in:
Lorenz Haas
2013-04-18 10:06:13 +02:00
committed by David Schulz
parent 63a04e0c15
commit 7d2a7685aa
6 changed files with 53 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/texteditor/displaysettings.cpp
View File

@@ -46,6 +46,7 @@ static const char markTextChangesKey[] = "MarkTextChanges";
static const char autoFoldFirstCommentKey[] = "AutoFoldFirstComment";
static const char centerCursorOnScrollKey[] = "CenterCursorOnScroll";
static const char openLinksInNextSplitKey[] = "OpenLinksInNextSplitKey";
static const char displayFileEncodingKey[] = "DisplayFileEncoding";
static const char groupPostfix[] = "DisplaySettings";
namespace TextEditor {
@@ -65,7 +66,8 @@ DisplaySettings::DisplaySettings() :
m_autoFoldFirstComment(true),
m_centerCursorOnScroll(false),
m_openLinksInNextSplit(false),
m_forceOpenLinksInNextSplit(false)
m_forceOpenLinksInNextSplit(false),
m_displayFileEncoding(false)
{
}
@@ -89,6 +91,7 @@ void DisplaySettings::toSettings(const QString &category, QSettings *s) const
s->setValue(QLatin1String(autoFoldFirstCommentKey), m_autoFoldFirstComment);
s->setValue(QLatin1String(centerCursorOnScrollKey), m_centerCursorOnScroll);
s->setValue(QLatin1String(openLinksInNextSplitKey), m_openLinksInNextSplit);
s->setValue(QLatin1String(displayFileEncodingKey), m_displayFileEncoding);
s->endGroup();
}
@@ -115,6 +118,7 @@ void DisplaySettings::fromSettings(const QString &category, const QSettings *s)
m_autoFoldFirstComment = s->value(group + QLatin1String(autoFoldFirstCommentKey), m_autoFoldFirstComment).toBool();
m_centerCursorOnScroll = s->value(group + QLatin1String(centerCursorOnScrollKey), m_centerCursorOnScroll).toBool();
m_openLinksInNextSplit = s->value(group + QLatin1String(openLinksInNextSplitKey), m_openLinksInNextSplit).toBool();
m_displayFileEncoding = s->value(group + QLatin1String(displayFileEncodingKey), m_displayFileEncoding).toBool();
}
bool DisplaySettings::equals(const DisplaySettings &ds) const
@@ -134,6 +138,7 @@ bool DisplaySettings::equals(const DisplaySettings &ds) const
&& m_centerCursorOnScroll == ds.m_centerCursorOnScroll
&& m_openLinksInNextSplit == ds.m_openLinksInNextSplit
&& m_forceOpenLinksInNextSplit == ds.m_forceOpenLinksInNextSplit
&& m_displayFileEncoding == ds.m_displayFileEncoding
;
}