From 8481a2fe7b6078df16518df3c325c6b2ff21f623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Mon, 20 Jun 2011 10:01:26 +0000 Subject: [PATCH] more version information; refs #85 --- swisssurfer/configure.in | 2 +- swisssurfer/src/browser.hxx | 12 +++++++++--- swisssurfer/src/swisssurfer_de.ts | 26 +++++++++++++++----------- swisssurfer/src/swisssurfer_en.ts | 27 ++++++++++++++++++--------- swisssurfer/src/swisssurfer_fr.ts | 26 +++++++++++++++----------- swisssurfer/src/swisssurfer_it.ts | 26 +++++++++++++++----------- 6 files changed, 73 insertions(+), 46 deletions(-) diff --git a/swisssurfer/configure.in b/swisssurfer/configure.in index 05327c8..a2cd8fb 100644 --- a/swisssurfer/configure.in +++ b/swisssurfer/configure.in @@ -11,7 +11,7 @@ m4_define(x_minor, 1) PACKAGENAME=x_packagename MAJOR=x_major MINOR=x_minor -BUILDDATE=$(date "+%d.%m.%Y") +BUILDDATE=$(date "+%d.%m.%Y/%H.%M") LEAST="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout" for path in . .. ../..; do diff --git a/swisssurfer/src/browser.hxx b/swisssurfer/src/browser.hxx index 9eaa426..211b02c 100644 --- a/swisssurfer/src/browser.hxx +++ b/swisssurfer/src/browser.hxx @@ -632,14 +632,20 @@ class Browser: public QMainWindow, protected Ui::Browser { void on_actionAbout_triggered() { QMessageBox::about(this, tr("About"), tr("SwissSurfer %1 (%2)\n\n" + "Version: %1\n" + "Builddate: %2\n" + "Libraries:\n" "%3\n" - "Using: qt-%4\n" - "Compiled: qt-%5") + "%4\n" + "qt-%5 (%6)\n" + "openssl-%7") .arg(VERSION) .arg(BUILDDATE) + .arg(QString::fromStdString(proxy::version())) .arg(QString::fromStdString(pcsc::version())) .arg(qVersion()) - .arg(QT_VERSION_STR)); + .arg(QT_VERSION_STR) + .arg(SHLIB_VERSION_NUMBER)); } void on_actionSettings_triggered() { diff --git a/swisssurfer/src/swisssurfer_de.ts b/swisssurfer/src/swisssurfer_de.ts index 62cdaad..dfa0a7a 100644 --- a/swisssurfer/src/swisssurfer_de.ts +++ b/swisssurfer/src/swisssurfer_de.ts @@ -280,22 +280,22 @@ - + Info: %1 - + done. - + page load error. - + %1 statusbar for hovered link %1=url @@ -340,10 +340,14 @@ SwissSurfer %1 (%2) +Version: %1 +Builddate: %2 +Libraries: %3 -Using: qt-%4 -Compiled: qt-%5 - Certificate Assistant %1 (%2) +%4 +qt-%5 (%6) +openssl-%7 + SwissSurfer %1 (%2) %3 Using: qt-%4 @@ -351,22 +355,22 @@ Compiled: qt-%5 - + %1 - + Save File As ... - + authentication required - + ssl error diff --git a/swisssurfer/src/swisssurfer_en.ts b/swisssurfer/src/swisssurfer_en.ts index ba9311c..7b05a6c 100644 --- a/swisssurfer/src/swisssurfer_en.ts +++ b/swisssurfer/src/swisssurfer_en.ts @@ -314,49 +314,58 @@ SwissSurfer %1 (%2) +Version: %1 +Builddate: %2 +Libraries: +%3 +%4 +qt-%5 (%6) +openssl-%7 + SwissSurfer %1 (%2) + %3 Using: qt-%4 -Compiled: qt-%5 +Compiled: qt-%5 - + %1 - + Info: %1 - + done. - + page load error. - + %1 statusbar for hovered link %1=url - + Save File As ... - + authentication required - + ssl error diff --git a/swisssurfer/src/swisssurfer_fr.ts b/swisssurfer/src/swisssurfer_fr.ts index 62cdaad..dfa0a7a 100644 --- a/swisssurfer/src/swisssurfer_fr.ts +++ b/swisssurfer/src/swisssurfer_fr.ts @@ -280,22 +280,22 @@ - + Info: %1 - + done. - + page load error. - + %1 statusbar for hovered link %1=url @@ -340,10 +340,14 @@ SwissSurfer %1 (%2) +Version: %1 +Builddate: %2 +Libraries: %3 -Using: qt-%4 -Compiled: qt-%5 - Certificate Assistant %1 (%2) +%4 +qt-%5 (%6) +openssl-%7 + SwissSurfer %1 (%2) %3 Using: qt-%4 @@ -351,22 +355,22 @@ Compiled: qt-%5 - + %1 - + Save File As ... - + authentication required - + ssl error diff --git a/swisssurfer/src/swisssurfer_it.ts b/swisssurfer/src/swisssurfer_it.ts index 62cdaad..dfa0a7a 100644 --- a/swisssurfer/src/swisssurfer_it.ts +++ b/swisssurfer/src/swisssurfer_it.ts @@ -280,22 +280,22 @@ - + Info: %1 - + done. - + page load error. - + %1 statusbar for hovered link %1=url @@ -340,10 +340,14 @@ SwissSurfer %1 (%2) +Version: %1 +Builddate: %2 +Libraries: %3 -Using: qt-%4 -Compiled: qt-%5 - Certificate Assistant %1 (%2) +%4 +qt-%5 (%6) +openssl-%7 + SwissSurfer %1 (%2) %3 Using: qt-%4 @@ -351,22 +355,22 @@ Compiled: qt-%5 - + %1 - + Save File As ... - + authentication required - + ssl error