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

Fixes: Enable switching of VCS according to currentProject

Browse Source 
Task: 205821
RevBy: con
Details:  Add a IVersionControl to git. Extend IF to able to return a name and add enabling options. Connect project explorer to enable the right VCS.
This commit is contained in:
Friedemann Kleint
2008-12-03 15:04:51 +01:00
parent 876c775805
commit 0b99d82d4e
21 changed files with 283 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -265,46 +265,18 @@ bool Qt4PriFileNode::changeIncludes(ProFile *includeFile, const QStringList &pro
return false;
}
namespace {
enum ReadOnlyAction { RO_Cancel, RO_OpenSCC, RO_MakeWriteable };
}
static ReadOnlyAction promptReadOnly(const QString &fileName, bool hasSCC, QWidget *parent)
{
QMessageBox msgBox(QMessageBox::Question, QObject::tr("File is Read Only"),
QObject::tr("The file %1 is read only.").arg(fileName),
QMessageBox::Cancel, parent);
QPushButton *sccButton = 0;
if (hasSCC)
sccButton = msgBox.addButton(QObject::tr("Open with SCC"), QMessageBox::AcceptRole);
QPushButton *makeWritableButton = msgBox.addButton(QObject::tr("Make writable"), QMessageBox::AcceptRole);
if (hasSCC)
msgBox.setDefaultButton(sccButton);
else
msgBox.setDefaultButton(makeWritableButton);
msgBox.exec();
QAbstractButton *clickedButton = msgBox.clickedButton();
if (clickedButton == sccButton)
return RO_OpenSCC;
if (clickedButton == makeWritableButton)
return RO_MakeWriteable;
return RO_Cancel;
}
bool Qt4PriFileNode::priFileWritable(const QString &path)
{
const QString dir = QFileInfo(path).dir().path();
Core::IVersionControl *versionControl = m_core->vcsManager()->findVersionControlForDirectory(dir);
switch (promptReadOnly(path, versionControl != 0, m_core->mainWindow())) {
case RO_OpenSCC:
switch (Core::EditorManager::promptReadOnlyFile(path, versionControl, m_core->mainWindow(), false)) {
case Core::EditorManager::RO_OpenVCS:
if (!versionControl->vcsOpen(path)) {
QMessageBox::warning(m_core->mainWindow(), tr("Failed!"), tr("Could not open the file for edit with SCC."));
return false;
}
break;
case RO_MakeWriteable: {
case Core::EditorManager::RO_MakeWriteable: {
const bool permsOk = QFile::setPermissions(path, QFile::permissions(path) | QFile::WriteUser);
if (!permsOk) {
QMessageBox::warning(m_core->mainWindow(), tr("Failed!"), tr("Could not set permissions to writable."));
@@ -312,10 +284,10 @@ bool Qt4PriFileNode::priFileWritable(const QString &path)
}
break;
}
case RO_Cancel: {
case Core::EditorManager::RO_SaveAs:
case Core::EditorManager::RO_Cancel:
return false;
}
}
return true;
}
@@ -457,7 +429,8 @@ void Qt4PriFileNode::save()
if (modifiedFileHandle)
fileManager->blockFileChange(modifiedFileHandle);
ProWriter pw;
bool ok = pw.write(m_includeFile, m_includeFile->fileName());
const bool ok = pw.write(m_includeFile, m_includeFile->fileName());
Q_UNUSED(ok)
m_includeFile->setModified(false);
m_project->qt4ProjectManager()->notifyChanged(m_includeFile->fileName());
if (modifiedFileHandle)