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

Fix project-specific default file encoding

Browse Source 
The project specific default file encoding would always be
locked to the default encoding when the project is loaded
the first time. This is unexpected and confuses users who
like to change the default encoding in the options dialog but
have never discovered (nor need) the project specific encoding.

The commit solves this by introducing a new value "Default" to
the project specific encoding combo box, which happens to
be the default.

Task-number: QTCREATORBUG-1996

Matthias
This commit is contained in:
mae
2010-08-06 11:54:09 +02:00
parent b3aff7b341
commit 7f0ab1a925
5 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/projectexplorer/editorconfiguration.cpp
View File

@@ -38,12 +38,8 @@ const char * const CODEC("EditorConfiguration.Codec");
}
EditorConfiguration::EditorConfiguration()
: m_defaultTextCodec(QTextCodec::codecForLocale())
: m_defaultTextCodec(0)
{
QSettings* settings = Core::ICore::instance()->settings();
if (QTextCodec *candidate = QTextCodec::codecForName(
settings->value(QLatin1String("General/DefaultFileEncoding")).toByteArray()))
m_defaultTextCodec = candidate;
}
QTextCodec *EditorConfiguration::defaultTextCodec() const
@@ -53,23 +49,22 @@ QTextCodec *EditorConfiguration::defaultTextCodec() const
void EditorConfiguration::setDefaultTextCodec(QTextCodec *codec)
{
if (!codec)
return;
m_defaultTextCodec = codec;
}
QVariantMap EditorConfiguration::toMap() const
{
QVariantMap map;
map.insert(QLatin1String(CODEC), m_defaultTextCodec->name());
QByteArray name = "Default";
if (m_defaultTextCodec)
name = m_defaultTextCodec->name();
map.insert(QLatin1String(CODEC), name);
return map;
}
bool EditorConfiguration::fromMap(const QVariantMap &map)
void EditorConfiguration::fromMap(const QVariantMap &map)
{
QTextCodec *codec = QTextCodec::codecForName(map.value(QLatin1String(CODEC)).toString().toLocal8Bit());
if (!codec)
return false;
QByteArray name = map.value(QLatin1String(CODEC)).toString().toLocal8Bit();
QTextCodec *codec = QTextCodec::codecForName(name);
m_defaultTextCodec = codec;
return true;
}