version info for time zone

diff --git a/src/main.cpp b/src/main.cpp
index d3da389..69ca6c7 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,6 +26,9 @@
 #include <QTranslator>
 #include <QUrl>
 
+#include <TimeStamp>
+#include <TZFile>
+
 #include "configdialog.h"
 #include "debug.h"
 #include "hmac.h"
@@ -104,6 +107,7 @@ void MApplication::versionDlg()
        QMessageBox mb;
        mb.setIconPixmap(QPixmap(":/icon.png"));
        mb.setWindowTitle(tr("MagicSmoke Version Information"));
+       TimeZoneLib::TZFile tzf=TimeStamp::defaultZoneFile();
        mb.setText(tr(  "<h3>MagicSmoke Version %3</h3>"
                        "<table>"
                        "<tr><td>Repository:<td>%1</tr>"
@@ -117,8 +121,8 @@ void MApplication::versionDlg()
                        "<tr><td>PACK&nbsp;Library:<td>%9<br/>%10</tr>"
                        "<tr><td>Qt:<td>%11</tr>"
                        "<tr><td>ELAM:<td>%12</tr>"
-                       "<tr><td>Time&nbsp;Zone&nbsp;Library:<td>%13</tr>"
-                       "<tr><td>Time&nbsp;Zone&nbsp;Data:<td>%14</tr>"
+                       "<tr><td>Time&nbsp;Zone&nbsp;Default:<td>%13 in %14<br/>version %15</tr>"
+                       "<tr><td>Time&nbsp;Zone&nbsp;Built-In:<td>%16</tr>"
                        "</table>"
                        )
                        .arg(htmlize(MSInterface::staticVersionInfo(WOb::VersionRootURL))) // %1
@@ -129,12 +133,14 @@ void MApplication::versionDlg()
                        .arg(htmlize(MSInterface::staticVersionInfo(WOb::VersionAuthor))) //&6
                        .arg(htmlize(MSInterface::staticWocVersionInfo(WOb::VersionRootURL))) //%7
                        .arg(htmlize(MSInterface::staticWocVersionInfo(WOb::VersionNumber)))
-                       .arg(htmlize(WInterface::staticLibraryVersionInfo(WOb::VersionRootURL))) //%0
+                       .arg(htmlize(WInterface::staticLibraryVersionInfo(WOb::VersionRootURL))) //%9
                        .arg(htmlize(WInterface::staticLibraryVersionInfo(WOb::VersionNumber)))
                        .arg(htmlize(QT_VERSION_STR)) //%11
                        .arg(htmlize(ELAM::versionInfo())) //%12
-                       .arg("??") //%13
-                       .arg("??") //%14
+                       .arg(tzf.name()) //%13
+                       .arg(tzf.dirName())
+                       .arg(tzf.version())
+                       .arg(TimeZoneLib::TZFile::builtinVersion()) //%16
                );
        mb.setStandardButtons(QMessageBox::Ok);
        mb.exec();

diff --git a/tzone b/tzone
index e8f6925..658457d 160000 (submodule)
--- a/tzone
+++ b/tzone
@@ -1 +1 @@
-Subproject commit e8f692597d177b69b5287d82514126b16a1a44e6
+Subproject commit 658457d56ee98a048b195b5bb5e525c88d368a55