AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed fossil path detection on windows

Browse Source 
The settings dialog now quotes paths to external tools if they contain spaces


FossilOrigin-Name: 208e56425e61f15f00ee2bbe200de18fda7fbc07
This commit is contained in:
kostas
2011-09-03 12:33:47 +00:00
parent aed3800b37
commit ee5f84b75d
4 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
MainWindow.cpp
View File

@ -748,16 +748,20 @@ QString MainWindow::getFossilPath()
{
// Use the user-specified fossil if available
if(!settings.fossilPath.isEmpty())
return settings.fossilPath;
return QDir::toNativeSeparators(settings.fossilPath);
// Use our fossil if available
QString fuel_fossil = QCoreApplication::applicationDirPath() + QDir::separator() + "fossil";
QString fossil_exe = "fossil";
#ifdef Q_WS_WIN32
fossil_exe += ".exe";
#endif
// Use our fossil if available
QString fuel_fossil = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + QDir::separator() + fossil_exe);
if(QFile::exists(fuel_fossil))
return fuel_fossil;
// Otherwise assume there is a "fossil" executable in the path
return "fossil";
return fossil_exe;
}
//------------------------------------------------------------------------------
void MainWindow::loadSettings()
@ -962,7 +966,7 @@ void MainWindow::on_actionHistory_triggered()
for(QStringList::iterator it = selection.begin(); it!=selection.end(); ++it)
{
QDesktopServices::openUrl(QUrl("http://localhost:8080/finfo?name="+*it));
QDesktopServices::openUrl(QUrl("http://127.0.0.1:8080/finfo?name="+*it));
}
}
@ -1332,7 +1336,7 @@ void MainWindow::on_actionSettings_triggered()
if(maps[m].value->isEmpty())
runFossil(QStringList() << "unset" << maps[m].command << "-global");
else
runFossil(QStringList() << "settings" << maps[m].command << *maps[m].value << "-global");
runFossil(QStringList() << "settings" << maps[m].command << *maps[m].value << "-global");
}
}