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

Editor: Fix: "Open File With..." with empty File

Browse Source 
and no extension is now handled as a plain text file.

Task-number: QTCREATORBUG-7591
Change-Id: I21471315cb6144f27c374e0919fd16e62f7d8f2a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
David Schulz
2012-09-18 08:45:43 +02:00
committed by David Schulz
parent 61fb4f55c8
commit 1035224774
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/bineditor/bineditorplugin.cpp
View File

@@ -222,8 +222,10 @@ public:
bool open(QString *errorString, const QString &fileName, quint64 offset = 0) { bool open(QString *errorString, const QString &fileName, quint64 offset = 0) {
QFile file(fileName); QFile file(fileName);
if (offset >= static_cast<quint64>(file.size())) if (offset >= static_cast<quint64>(file.size())) {
*errorString = tr("The Binary Editor can not open empty files.");
return false; return false;
}
if (file.open(QIODevice::ReadOnly)) { if (file.open(QIODevice::ReadOnly)) {
file.close(); file.close();
m_fileName = fileName; m_fileName = fileName;

5
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -1173,9 +1173,10 @@ Core::Id EditorManager::getOpenWithEditorId(const QString &fileName,
bool *isExternalEditor) const bool *isExternalEditor) const
{ {
// Collect editors that can open the file // Collect editors that can open the file
const MimeType mt = ICore::mimeDatabase()->findByFile(fileName); MimeType mt = ICore::mimeDatabase()->findByFile(fileName);
//Unable to determine mime type of fileName. Falling back to text/plain",
if (!mt) if (!mt)
return Id(); mt = ICore::mimeDatabase()->findByType(QLatin1String("text/plain"));
QStringList allEditorIds; QStringList allEditorIds;
QStringList allEditorDisplayNames; QStringList allEditorDisplayNames;
QList<Id> externalEditorIds; QList<Id> externalEditorIds;