Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Use getVersionFromExecutable in CProfilesDialog, see #279

Browse source
This commit is contained in:
kervala 2016-09-22 18:10:13 +02:00
parent 55a9aa7f7d
commit f881cfe327
1 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
code/ryzom/tools/client/ryzom_installer/src/profilesdialog.cpp
View file

@ -19,6 +19,7 @@
#include "profilesmodel.h" #include "profilesmodel.h"
#include "serversmodel.h" #include "serversmodel.h"
#include "operationdialog.h" #include "operationdialog.h"
#include "utils.h"
#ifdef DEBUG_NEW #ifdef DEBUG_NEW
#define new DEBUG_NEW #define new DEBUG_NEW
@ -222,27 +223,12 @@ void CProfilesDialog::updateExecutableVersion(int index)
// file doesn't exist // file doesn't exist
if (executable.isEmpty() || !QFile::exists(executable)) return; if (executable.isEmpty() || !QFile::exists(executable)) return;
// launch executable with --version argument
QProcess process;
process.setProcessChannelMode(QProcess::MergedChannels);
process.start(executable, QStringList() << "--version", QIODevice::ReadWrite);
if (!process.waitForStarted()) return;
QByteArray data;
// read all output
while (process.waitForReadyRead()) data.append(process.readAll());
// convert output to string // convert output to string
QString versionString = QString::fromUtf8(data); QString versionString = getVersionFromExecutable(executable);
// parse version from output if (!versionString.isEmpty())
QRegExp reg("([A-Za-z0-1_.]+) ((DEV|FV) ([0-9.]+))");
if (reg.indexIn(versionString) > -1)
{ {
executablePathLabel->setText(QString("%1 (%2)").arg(QFileInfo(executable).fileName()).arg(reg.cap(2))); executablePathLabel->setText(QString("%1 (%2)").arg(QFileInfo(executable).fileName()).arg(versionString));
} }
} }