mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add details about key libraries when showing version

Browse source 
Also fixed a spelling error and apparently some whitespace issue.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-11-09 06:43:38 -08:00
parent 76f595049b
commit bcabe6ec9f
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/qthelper.cpp
View file

@ -940,7 +940,7 @@ QString get_dive_duration_string(timestamp_t when, QString hoursText, QString mi
.arg(secs).arg(secondsText); .arg(secs).arg(secondsText);
} else if (isFreeDive) { } else if (isFreeDive) {
// Mixed display (hh:mm / mm only) and freedive < 1h and we have no unit for minutes // Mixed display (hh:mm / mm only) and freedive < 1h and we have no unit for minutes
// --> Prefix duration with "0:" --> "0:05:35" // --> Prefix duration with "0:" --> "0:05:35"
if (separator == ":") displayTime = QString("%1%2%3%4%5%6").arg(hrs).arg(separator) if (separator == ":") displayTime = QString("%1%2%3%4%5%6").arg(hrs).arg(separator)
.arg(fullmins, 2, 10, QChar('0')).arg(separator) .arg(fullmins, 2, 10, QChar('0')).arg(separator)
.arg(secs, 2, 10, QChar('0')).arg(hoursText); .arg(secs, 2, 10, QChar('0')).arg(hoursText);
@ -1728,3 +1728,8 @@ extern "C" void cache_insert(int tissue, int timestep, enum inertgas inertgas, d
++key; ++key;
factor_cache.insert(key, value); factor_cache.insert(key, value);
} }
extern "C" void print_qt_versions()
{
printf("%s\n", QStringLiteral("built with Qt Version %1, runtime from Qt Version %2").arg(QT_VERSION_STR).arg(qVersion()).toUtf8().data());
}

1
core/qthelperfromc.h
View file

@ -25,5 +25,6 @@ extern const char *get_current_date();
enum inertgas {N2, HE}; enum inertgas {N2, HE};
double cache_value(int tissue, int timestep, enum inertgas gas); double cache_value(int tissue, int timestep, enum inertgas gas);
void cache_insert(int tissue, int timestep, enum inertgas gas, double value); void cache_insert(int tissue, int timestep, enum inertgas gas, double value);
void print_qt_versions();
#endif // QTHELPERFROMC_H #endif // QTHELPERFROMC_H

6
core/subsurfacestartup.c
View file

@ -150,8 +150,12 @@ bool imported = false;
static void print_version() static void print_version()
{ {
printf("Subsurface v%s, ", subsurface_git_version()); printf("Subsurface v%s,\n", subsurface_git_version());
printf("built with libdivecomputer v%s\n", dc_version(NULL)); printf("built with libdivecomputer v%s\n", dc_version(NULL));
print_qt_versions();
int git_maj, git_min, git_rev;
git_libgit2_version(&git_maj, &git_min, &git_rev);
printf("built with libgit2 %d.%d.%d\n", git_maj, git_min, git_rev);
} }
void print_files() void print_files()

4
subsurface-desktop-main.cpp
View file

@ -107,10 +107,8 @@ int main(int argc, char **argv)
qDebug() << "importing dive data from" << importedFiles; qDebug() << "importing dive data from" << importedFiles;
m->importFiles(importedFiles); m->importFiles(importedFiles);
if (verbose > 0) { if (verbose > 0)
print_files(); print_files();
printf("%s\n", QStringLiteral("build with Qt Version %1, runtime from Qt Version %2").arg(QT_VERSION_STR).arg(qVersion()).toUtf8().data());
}
if (!quit) if (!quit)
run_ui(); run_ui();
exit_ui(); exit_ui();