diff --git a/uppsrc/ide/About.cpp b/uppsrc/ide/About.cpp index e8e6d4b8b..1933e1899 100644 --- a/uppsrc/ide/About.cpp +++ b/uppsrc/ide/About.cpp @@ -15,12 +15,7 @@ String SplashCtrl::GenerateVersionInfo(char separator) { String h; - h << "Version: "; -#ifdef bmSVN_REVISION - h << bmSVN_REVISION; -#else - h << IDE_VERSION; -#endif + h << "Version: " << GenerateVersionNumber(); h << separator; if(sizeof(void *) == 8) h << "(64 bit)"; @@ -50,6 +45,15 @@ String SplashCtrl::GenerateVersionInfo(char separator) return h; } +String SplashCtrl::GenerateVersionNumber() +{ +#ifdef bmSVN_REVISION + return bmSVN_REVISION; +#else + return IDE_VERSION; +#endif +} + Size SplashCtrl::MakeLogo(Ctrl& parent, Array& ctrl) { Image logo = IdeImg::logo(); diff --git a/uppsrc/ide/About.h b/uppsrc/ide/About.h index bf7fc111c..906d9c2d3 100644 --- a/uppsrc/ide/About.h +++ b/uppsrc/ide/About.h @@ -9,6 +9,7 @@ class SplashCtrl final : public Ctrl { public: static String GenerateVersionInfo(char separator = '\n'); + static String GenerateVersionNumber(); static Size MakeLogo(Ctrl& parent, Array& ctrl); public: diff --git a/uppsrc/ide/ide.cpp b/uppsrc/ide/ide.cpp index 66f188389..ac00f6efa 100644 --- a/uppsrc/ide/ide.cpp +++ b/uppsrc/ide/ide.cpp @@ -173,14 +173,13 @@ void Ide::Exit() bool Ide::OpenMainPackage() { + String version = SplashCtrl::GenerateVersionNumber(); String tt = "Select main package"; -// tt << " (IDE " << IDE_VER_MAJOR << "." << IDE_VER_MINOR << ".r" << IDE_VER_BUILD -// << ", " << ::AsString(IDE_VER_DATE) << ")"; #ifdef bmYEAR - tt << " (TheIDE " << IDE_VERSION + tt << " (TheIDE " << version << Format(" %d-%02d-%02d %d:%02d)", bmYEAR , bmMONTH, bmDAY, bmHOUR, bmMINUTE); #else - tt << " (TheIDE " << IDE_VERSION << ')'; + tt << " (TheIDE " << version << ')'; #endif String p = SelectPackage(tt, main, true, true); if(p.IsEmpty()) return false;