...
 
Commits (6)
The QtCreator 1.1.1 release is a pure bug fix release for the Windows platform.
Platform Specific
Windows
* Fixed performance problem on Windows machines that are part of a
windows domain
......@@ -5,7 +5,7 @@
\title Qt Creator Manual
\section1 Version 1.1.0
\section1 Version 1.1.1
The goal of Qt Creator is to provide a cross-platform, complete Integrated
Development Environment (IDE) to develop Qt projects. It is available for
......@@ -61,7 +61,7 @@
\o \l{Keyboard Shortcuts}
\o \l{Glossary}
\o \l{Supported Platforms}
\o \l{Known Issues of Version 1.1.0}
\o \l{Known Issues of Version 1.1.1}
\o \l{Acknowledgements}
\endlist
......@@ -1304,7 +1304,7 @@
targets specified in the \c CMake project file.
Known issues for the current version can be found
\l{Known Issues of Version 1.1.0}{here}.
\l{Known Issues of Version 1.1.1}{here}.
*/
......@@ -1545,9 +1545,9 @@
\page creator-known-issues.html
\nextpage creator-acknowledgements.html
\title Known Issues of Version 1.1.0
\title Known Issues of Version 1.1.1
There are some known issues with Qt Creator 1.1.0.
There are some known issues with Qt Creator 1.1.1.
The development team is aware of those, there is no need to report them as bug.
\list
......
......@@ -18,15 +18,15 @@ sources.fileextensions = "qtcreator.qdoc"
qhp.projects = QtCreator
qhp.QtCreator.file = qtcreator.qhp
qhp.QtCreator.namespace = com.nokia.qtcreator.110
qhp.QtCreator.namespace = com.nokia.qtcreator.111
qhp.QtCreator.virtualFolder = doc
qhp.QtCreator.indexTitle = Qt Creator
qhp.QtCreator.indexRoot =
qhp.QtCreator.extraFiles = classic.css \
images/qt-logo.png
qhp.QtCreator.filterAttributes = qtcreator 1.1.0
qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.1.0
qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.1.0
qhp.QtCreator.filterAttributes = qtcreator 1.1.1
qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.1.1
qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.1.1
# macros.qdocconf
......@@ -202,5 +202,5 @@ HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
"<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
"<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia</td>\n" \
"<td width=\"40%\" align=\"center\">&nbsp;</td>\n" \
"<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Creator 1.1.0</div></td>\n" \
"<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Creator 1.1.1</div></td>\n" \
"</tr></table></div></address>"
......@@ -182,8 +182,8 @@
<key>CFBundleIdentifier</key>
<string>com.nokia.qtcreator</string>
<key>CFBundleVersion</key>
<string>1.1.0</string>
<string>1.1.1</string>
<key>CFBundleShortVersionString</key>
<string>1.1.0</string>
<string>1.1.1</string>
</dict>
</plist>
<plugin name="BinEditor" version="1.1.0" compatVersion="1.1.0">
<plugin name="BinEditor" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,7 +19,7 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Binary editor component.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.1.0"/>
<dependency name="TextEditor" version="1.1.0"/>
<dependency name="Core" version="1.1.1"/>
<dependency name="TextEditor" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="Bookmarks" version="1.1.0" compatVersion="1.1.0">
<plugin name="Bookmarks" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Bookmarks in text editors.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.1.0"/>
<dependency name="ProjectExplorer" version="1.1.0"/>
<dependency name="Core" version="1.1.0"/>
<dependency name="TextEditor" version="1.1.1"/>
<dependency name="ProjectExplorer" version="1.1.1"/>
<dependency name="Core" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="CMakeProjectManager" version="1.1.0" compatVersion="1.1.0">
<plugin name="CMakeProjectManager" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,10 +19,10 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>CMake support</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.1.0"/>
<dependency name="ProjectExplorer" version="1.1.0"/>
<dependency name="CppTools" version="1.1.0"/>
<dependency name="CppEditor" version="1.1.0"/>
<dependency name="Help" version="1.1.0"/>
<dependency name="TextEditor" version="1.1.1"/>
<dependency name="ProjectExplorer" version="1.1.1"/>
<dependency name="CppTools" version="1.1.1"/>
<dependency name="CppEditor" version="1.1.1"/>
<dependency name="Help" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="Core" version="1.1.0" compatVersion="1.1.0">
<plugin name="Core" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......
......@@ -35,7 +35,7 @@ namespace Constants {
#define IDE_VERSION_MAJOR 1
#define IDE_VERSION_MINOR 1
#define IDE_VERSION_RELEASE 0
#define IDE_VERSION_RELEASE 1
#define STRINGIFY_INTERNAL(x) #x
#define STRINGIFY(x) STRINGIFY_INTERNAL(x)
......
......@@ -678,9 +678,9 @@ bool EditorManager::closeEditors(const QList<IEditor*> editorsToClose, bool askA
if (cancelled)
return false;
if (!list.isEmpty()) {
closingFailed = true;
QSet<IEditor*> skipSet = editorsForFiles(list).toSet();
acceptedEditors = acceptedEditors.toSet().subtract(skipSet).toList();
closingFailed = false;
}
}
if (acceptedEditors.isEmpty())
......@@ -1173,24 +1173,38 @@ bool EditorManager::saveFile(IEditor *editor)
return false;
IFile *file = editor->file();
file->checkPermissions();
const QString &fileName = file->fileName();
if (!fileName.isEmpty() && file->isReadOnly()) {
if (fileName.isEmpty())
return saveFileAs(editor);
bool success = false;
// try saving, no matter what isReadOnly tells us
m_d->m_core->fileManager()->blockFileChange(file);
success = file->save(fileName);
m_d->m_core->fileManager()->unblockFileChange(file);
if (!success) {
MakeWritableResult answer =
makeEditorWritable(editor);
if (answer == Failed)
return false;
if (answer == SavedAs)
return true;
}
if (file->isReadOnly() || fileName.isEmpty())
return saveFileAs(editor);
file->checkPermissions();
m_d->m_core->fileManager()->blockFileChange(file);
success = file->save(fileName);
m_d->m_core->fileManager()->unblockFileChange(file);
}
m_d->m_core->fileManager()->blockFileChange(file);
const bool success = file->save(fileName);
m_d->m_core->fileManager()->unblockFileChange(file);
if (success)
m_d->m_core->fileManager()->addToRecentFiles(editor->file()->fileName());
return success;
}
......@@ -1212,7 +1226,7 @@ EditorManager::ReadOnlyAction
QPushButton *saveAsButton = 0;
if (displaySaveAsButton)
msgBox.addButton(QObject::tr("Save as ..."), QMessageBox::ActionRole);
saveAsButton = msgBox.addButton(QObject::tr("Save as ..."), QMessageBox::ActionRole);
msgBox.setDefaultButton(sccButton ? sccButton : makeWritableButton);
msgBox.exec();
......@@ -1242,6 +1256,7 @@ EditorManager::makeEditorWritable(IEditor *editor)
QMessageBox::warning(m_d->m_core->mainWindow(), tr("Failed!"), tr("Could not open the file for edit with SCC."));
return Failed;
}
file->checkPermissions();
return OpenedWithVersionControl;
case RO_MakeWriteable: {
const bool permsOk = QFile::setPermissions(fileName, QFile::permissions(fileName) | QFile::WriteUser);
......@@ -1250,6 +1265,7 @@ EditorManager::makeEditorWritable(IEditor *editor)
return Failed;
}
}
file->checkPermissions();
return MadeWritable;
case RO_SaveAs :
return saveFileAs(editor) ? SavedAs : Failed;
......@@ -1279,6 +1295,7 @@ bool EditorManager::saveFileAs(IEditor *editor)
m_d->m_core->fileManager()->blockFileChange(editor->file());
const bool success = editor->file()->save(absoluteFilePath);
m_d->m_core->fileManager()->unblockFileChange(editor->file());
editor->file()->checkPermissions();
if (success)
m_d->m_core->fileManager()->addToRecentFiles(editor->file()->fileName());
......
......@@ -383,6 +383,7 @@ QList<IFile *> FileManager::saveModifiedFiles(const QList<IFile *> &files,
if (!fileName.isEmpty()) {
blockFileChange(file);
ok = file->save(fileName);
file->checkPermissions();
unblockFileChange(file);
}
if (!ok)
......
......@@ -60,6 +60,8 @@ public:
virtual void modified(ReloadBehavior *behavior) = 0;
virtual void checkPermissions() {}
signals:
void changed();
};
......
......@@ -354,8 +354,8 @@ void MainWindow::closeEvent(QCloseEvent *event)
// Save opened files
bool cancelled;
fileManager()->saveModifiedFiles(fileManager()->modifiedFiles(), &cancelled);
if (cancelled) {
QList<IFile*> notSaved = fileManager()->saveModifiedFiles(fileManager()->modifiedFiles(), &cancelled);
if (cancelled || !notSaved.isEmpty()) {
event->ignore();
return;
}
......
<plugin name="CodePaster" version="1.1.0" compatVersion="1.1.0">
<plugin name="CodePaster" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Codepaster plugin for pushing/fetching diff from server</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.1.0"/>
<dependency name="ProjectExplorer" version="1.1.0"/>
<dependency name="Core" version="1.1.0"/>
<dependency name="TextEditor" version="1.1.1"/>
<dependency name="ProjectExplorer" version="1.1.1"/>
<dependency name="Core" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="CppEditor" version="1.1.0" compatVersion="1.1.0">
<plugin name="CppEditor" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>C/C++ editor component.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.1.0"/>
<dependency name="TextEditor" version="1.1.0"/>
<dependency name="CppTools" version="1.1.0"/>
<dependency name="Core" version="1.1.1"/>
<dependency name="TextEditor" version="1.1.1"/>
<dependency name="CppTools" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="CppTools" version="1.1.0" compatVersion="1.1.0">
<plugin name="CppTools" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Tools for analyzing C/C++ code.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.1.0"/>
<dependency name="ProjectExplorer" version="1.1.0"/>
<dependency name="QuickOpen" version="1.1.0"/>
<dependency name="TextEditor" version="1.1.1"/>
<dependency name="ProjectExplorer" version="1.1.1"/>
<dependency name="QuickOpen" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="Debugger" version="1.1.0" compatVersion="1.1.0">
<plugin name="Debugger" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Debugger integration.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="CppEditor" version="1.1.0"/><!-- Debugger plugin adds items to the editor's context menu -->
<dependency name="ProjectExplorer" version="1.1.0"/>
<dependency name="Core" version="1.1.0"/>
<dependency name="Find" version="1.1.0"/>
<dependency name="CppEditor" version="1.1.1"/><!-- Debugger plugin adds items to the editor's context menu -->
<dependency name="ProjectExplorer" version="1.1.1"/>
<dependency name="Core" version="1.1.1"/>
<dependency name="Find" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="Designer" version="1.1.0" compatVersion="1.1.0">
<plugin name="Designer" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Qt Designer integration.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.1.0"/>
<dependency name="Core" version="1.1.1"/>
<!-- For compiling with CPP support enabled -->
<dependency name="CppEditor" version="1.1.0"/>
<dependency name="CppEditor" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="FakeVim" version="1.1.0" compatVersion="1.1.0">
<plugin name="FakeVim" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>VI-style keyboard navigation.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="CppEditor" version="1.1.0"/><!-- Plugin adds items to the editor's context menu -->
<dependency name="TextEditor" version="1.1.0"/>
<dependency name="ProjectExplorer" version="1.1.0"/>
<dependency name="Core" version="1.1.0"/>
<dependency name="CppEditor" version="1.1.1"/><!-- Plugin adds items to the editor's context menu -->
<dependency name="TextEditor" version="1.1.1"/>
<dependency name="ProjectExplorer" version="1.1.1"/>
<dependency name="Core" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="Find" version="1.1.0" compatVersion="1.1.0">
<plugin name="Find" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Provides the find widget and the hooks for find implementations.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.1.0"/>
<dependency name="Core" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="GenericProjectManager" version="1.1.0" compatVersion="1.1.0">
<plugin name="GenericProjectManager" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,10 +19,10 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Generic support</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.1.0"/>
<dependency name="ProjectExplorer" version="1.1.0"/>
<dependency name="CppTools" version="1.1.0"/>
<dependency name="CppEditor" version="1.1.0"/>
<dependency name="Help" version="1.1.0"/>
<dependency name="TextEditor" version="1.1.1"/>
<dependency name="ProjectExplorer" version="1.1.1"/>
<dependency name="CppTools" version="1.1.1"/>
<dependency name="CppEditor" version="1.1.1"/>
<dependency name="Help" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="ScmGit" version="1.1.0" compatVersion="1.1.0">
<plugin name="ScmGit" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Git integration.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.1.0"/>
<dependency name="ProjectExplorer" version="1.1.0"/>
<dependency name="Core" version="1.1.0"/>
<dependency name="VCSBase" version="1.1.0"/>
<dependency name="TextEditor" version="1.1.1"/>
<dependency name="ProjectExplorer" version="1.1.1"/>
<dependency name="Core" version="1.1.1"/>
<dependency name="VCSBase" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="HelloWorld" version="1.1.0" compatVersion="1.1.0">
<plugin name="HelloWorld" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Hello World sample plugin.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.1.0"/>
<dependency name="Core" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="Help" version="1.1.0" compatVersion="1.1.0">
<plugin name="Help" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Help system.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.1.0"/>
<dependency name="Find" version="1.1.0"/>
<dependency name="QuickOpen" version="1.1.0"/>
<dependency name="Core" version="1.1.1"/>
<dependency name="Find" version="1.1.1"/>
<dependency name="QuickOpen" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="Perforce" version="1.1.0" compatVersion="1.1.0">
<plugin name="Perforce" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Perforce integration.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.1.0"/>
<dependency name="ProjectExplorer" version="1.1.0"/>
<dependency name="Core" version="1.1.0"/>
<dependency name="VCSBase" version="1.1.0"/>
<dependency name="TextEditor" version="1.1.1"/>
<dependency name="ProjectExplorer" version="1.1.1"/>
<dependency name="Core" version="1.1.1"/>
<dependency name="VCSBase" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="ProjectExplorer" version="1.1.0" compatVersion="1.1.0">
<plugin name="ProjectExplorer" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>ProjectExplorer framework that can be extended with different kind of project types.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.1.0"/>
<dependency name="Find" version="1.1.0"/>
<dependency name="QuickOpen" version="1.1.0"/>
<dependency name="TextEditor" version="1.1.0"/>
<dependency name="Core" version="1.1.1"/>
<dependency name="Find" version="1.1.1"/>
<dependency name="QuickOpen" version="1.1.1"/>
<dependency name="TextEditor" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="Qt4ProjectManager" version="1.1.0" compatVersion="1.1.0">
<plugin name="Qt4ProjectManager" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,10 +19,10 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Provides project type for Qt 4 pro files and tools.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.1.0"/>
<dependency name="ProjectExplorer" version="1.1.0"/>
<dependency name="CppTools" version="1.1.0"/>
<dependency name="CppEditor" version="1.1.0"/>
<dependency name="Help" version="1.1.0"/>
<dependency name="TextEditor" version="1.1.1"/>
<dependency name="ProjectExplorer" version="1.1.1"/>
<dependency name="CppTools" version="1.1.1"/>
<dependency name="CppEditor" version="1.1.1"/>
<dependency name="Help" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="QtScriptEditor" version="1.1.0" compatVersion="1.1.0">
<plugin name="QtScriptEditor" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,7 +19,7 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Editor for QtScript.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.1.0"/>
<dependency name="TextEditor" version="1.1.0"/>
<dependency name="Core" version="1.1.1"/>
<dependency name="TextEditor" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="QuickOpen" version="1.1.0" compatVersion="1.1.0">
<plugin name="QuickOpen" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Provides the QuickOpen widget and the hooks for QuickOpen filter implementations.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.1.0"/>
<dependency name="Core" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="RegExp" version="1.1.0" compatVersion="1.1.0">
<plugin name="RegExp" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Regular Expression test widget.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.1.0"/>
<dependency name="Core" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="ResourceEditor" version="1.1.0" compatVersion="1.1.0">
<plugin name="ResourceEditor" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Editor for qrc files.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.1.0"/>
<dependency name="Core" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="Snippets" version="1.1.0" compatVersion="1.1.0">
<plugin name="Snippets" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Code snippet plugin.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.1.0"/>
<dependency name="TextEditor" version="1.1.0"/>
<dependency name="ProjectExplorer" version="1.1.0"/>
<dependency name="Core" version="1.1.1"/>
<dependency name="TextEditor" version="1.1.1"/>
<dependency name="ProjectExplorer" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="Subversion" version="1.1.0" compatVersion="1.1.0">
<plugin name="Subversion" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Subversion integration.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.1.0"/>
<dependency name="ProjectExplorer" version="1.1.0"/>
<dependency name="Core" version="1.1.0"/>
<dependency name="VCSBase" version="1.1.0"/>
<dependency name="TextEditor" version="1.1.1"/>
<dependency name="ProjectExplorer" version="1.1.1"/>
<dependency name="Core" version="1.1.1"/>
<dependency name="VCSBase" version="1.1.1"/>
</dependencyList>
</plugin>
<plugin name="TextEditor" version="1.1.0" compatVersion="1.1.0">
<plugin name="TextEditor" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Text editor framework and the implementation of the basic text editor.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.1.0"/>
<dependency name="Find" version="1.1.0"/>
<dependency name="QuickOpen" version="1.1.0"/>
<dependency name="Core" version="1.1.1"/>
<dependency name="Find" version="1.1.1"/>
<dependency name="QuickOpen" version="1.1.1"/>
</dependencyList>
</plugin>
......@@ -47,18 +47,6 @@
using namespace TextEditor;
#if defined (Q_OS_WIN)
QT_BEGIN_NAMESPACE
extern Q_CORE_EXPORT int qt_ntfs_permission_lookup;
QT_END_NAMESPACE
#endif
#if defined (Q_OS_WIN)
# define NATIVE_LINE_TERMINATOR CRLFLineTerminator
#else
# define NATIVE_LINE_TERMINATOR LFLineTerminator
#endif
DocumentMarker::DocumentMarker(QTextDocument *doc)
: ITextMarkable(doc), document(doc)
{
......@@ -70,6 +58,7 @@ BaseTextDocument::BaseTextDocument()
{
m_documentMarker = new DocumentMarker(m_document);
m_lineTerminatorMode = NativeLineTerminator;
m_fileIsReadOnly = false;
m_isBinaryData = false;
m_codec = QTextCodec::codecForLocale();
m_hasDecodingError = false;
......@@ -146,20 +135,7 @@ bool BaseTextDocument::isReadOnly() const
return true;
if (m_fileName.isEmpty()) //have no corresponding file, so editing is ok
return false;
const QFileInfo fi(m_fileName);
#ifdef Q_OS_WIN
// Check for permissions on NTFS file systems
qt_ntfs_permission_lookup++;
#endif
const bool ro = !fi.isWritable();
#ifdef Q_OS_WIN
qt_ntfs_permission_lookup--;
#endif
return ro;
return m_fileIsReadOnly;
}
bool BaseTextDocument::isModified() const
......@@ -167,11 +143,22 @@ bool BaseTextDocument::isModified() const
return m_document->isModified();
}
void BaseTextDocument::checkPermissions()
{
if (!m_fileName.isEmpty()) {
const QFileInfo fi(m_fileName);
m_fileIsReadOnly = !fi.isWritable();
} else {
m_fileIsReadOnly = false;
}
}
bool BaseTextDocument::open(const QString &fileName)
{
QString title = tr("untitled");
if (!fileName.isEmpty()) {
const QFileInfo fi(fileName);
m_fileIsReadOnly = !fi.isWritable();
m_fileName = fi.absoluteFilePath();
QFile file(fileName);
......
......@@ -83,6 +83,7 @@ public:
virtual bool isReadOnly() const;
virtual bool isModified() const;
virtual bool isSaveAsAllowed() const { return true; }
virtual void checkPermissions();
virtual void modified(Core::IFile::ReloadBehavior *behavior);
virtual QString mimeType() const;
void setMimeType(const QString &mt);
......@@ -141,6 +142,7 @@ private:
LineTerminatorMode m_lineTerminatorMode;
QTextCodec *m_codec;
bool m_fileIsReadOnly;
bool m_isBinaryData;
bool m_hasDecodingError;
QByteArray m_decodingErrorSample;
......
......@@ -1312,15 +1312,6 @@ void BaseTextEditorPrivate::setupDocumentSignals(BaseTextDocument *document)
q->slotUpdateExtraAreaWidth();
}
#ifndef TEXTEDITOR_STANDALONE
bool BaseTextEditorPrivate::needMakeWritableCheck() const
{
return !m_document->isModified()
&& !m_document->fileName().isEmpty()
&& m_document->isReadOnly();
}
#endif
bool Parenthesis::hasClosingCollapse(const Parentheses &parentheses)
{
return closeCollapseAtPos(parentheses) >= 0;
......
......@@ -128,9 +128,6 @@ public:
#endif
void setupDocumentSignals(BaseTextDocument *document);
void updateLineSelectionColor();
#ifndef TEXTEDITOR_STANDALONE
bool needMakeWritableCheck() const;
#endif
void print(QPrinter *printer);
......
<plugin name="VCSBase" version="1.1.0" compatVersion="1.1.0">
<plugin name="VCSBase" version="1.1.1" compatVersion="1.1.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Version Control System Base Plugin</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.1.0"/>
<dependency name="TextEditor" version="1.1.0"/>
<dependency name="ProjectExplorer" version="1.1.0"/>
<dependency name="Core" version="1.1.1"/>
<dependency name="TextEditor" version="1.1.1"/>
<dependency name="ProjectExplorer" version="1.1.1"/>
</dependencyList>
</plugin>