github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Ide: Select main package now takes version number from SplashCtrl.

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12116 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
klugier 2018-07-29 14:55:30 +00:00
parent be0ff6854b
commit 44a5e8c233
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
uppsrc/ide/About.cpp
View file

@ -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>& ctrl)
{
Image logo = IdeImg::logo();

1
uppsrc/ide/About.h
View file

@ -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>& ctrl);
public:

7
uppsrc/ide/ide.cpp
View file

@ -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;