devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Improve update check information dialog.

Browse source 
Show the user both the current and updated version.

Change-Id: Ief693cce020a39a0c79bf2705da4a44b7bd15928
This commit is contained in:
Dominik Riebeling 2015-01-31 18:30:42 +01:00
parent 43b1ccffcc
commit 72b81c2559
5 changed files with 60 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rbutil/rbutilqt/base/utils.cpp
View file

@ -342,6 +342,20 @@ QString Utils::checkEnvironment(bool permission)
else
return text;
}
/** @brief Trim version string from filename to version part only.
* @param s Version string
* @return Version part of string if found, input string on error.
*/
QString Utils::trimVersionString(QString s)
{
QRegExp r = QRegExp(".*([\\d\\.]+\\d+[a-z]?).*");
if(r.indexIn(s) != -1) {
return r.cap(1);
}
return s;
}
/** @brief Compare two version strings.
* @param s1 first version string
* @param s2 second version string

1
rbutil/rbutilqt/base/utils.h
View file

@ -49,6 +49,7 @@ public:
static QString findExecutable(QString name);
static QString checkEnvironment(bool permission);
static int compareVersionStrings(QString s1, QString s2);
static QString trimVersionString(QString s);
static QString filesystemName(QString path);
static QStringList mountpoints(enum MountpointsFilter type = MountpointsAll);
static QString resolveDevicename(QString path);