About Box cleanup

This commit is contained in:
Mark Watkins 2011-06-06 16:46:05 +10:00
parent 4c74c58394
commit bbbcf67b6d
3 changed files with 34 additions and 13 deletions

View File

@ -8295,7 +8295,7 @@
<sleeplib/machine.h>
<list>
1307245704 /home/mark/projects/git/sleepyhead/src/version.h
1307342695 /home/mark/projects/git/sleepyhead/src/version.h
1307245704 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h
"machine.h"
@ -8312,11 +8312,12 @@
"preferences.h"
"tinyxml/tinyxml.h"
1307333457 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp
1307342349 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp
"wx_pch.h"
"version.h"
<wx/app.h>
<wx/icon.h>
<wx/aboutdlg.h>
<wx/msgdlg.h>
<wx/dirdlg.h>
<wx/progdlg.h>
@ -8426,3 +8427,13 @@
"zeo_loader.h"
"sleeplib/machine.h"
1302101441 /usr/include/wx-2.8/wx/aboutdlg.h
"wx/defs.h"
"wx/app.h"
"wx/icon.h"
1305615469 /opt/mingw/usr/i686-pc-mingw32//include/wx-2.9/wx/aboutdlg.h
"wx/defs.h"
"wx/app.h"
"wx/icon.h"

View File

@ -18,6 +18,7 @@
#include "version.h"
#include <wx/app.h>
#include <wx/icon.h>
#include <wx/aboutdlg.h>
#include <wx/msgdlg.h>
#include <wx/dirdlg.h>
#include <wx/progdlg.h>
@ -242,8 +243,17 @@ void SleepyHeadFrame::OnShowSerial(wxCommandEvent& event)
void SleepyHeadFrame::OnAbout(wxCommandEvent &event)
{
wxString msg = wxbuildinfo(long_f);
msg=wxTheApp->GetAppName()+wxT(" v")+wxString(AutoVersion::FULLVERSION_STRING,wxConvUTF8)+wxT("\nAuthors: Mark Watkins / Troy Schultz\nThis is alpha software is guaranteed to break regularly!\nUse at your own risk.\n\nLicense: GPL"); //,AutoVersion::DATE,AutoVersion::MONTH,AutoVersion::YEAR
// wxAboutBox is fairly useless.
wxString day=wxString(AutoVersion::DATE,wxConvUTF8);
wxString month=wxString(AutoVersion::MONTH,wxConvUTF8);
wxString year=wxString(AutoVersion::YEAR,wxConvUTF8);
wxString date=day+wxT("/")+month+wxT("/")+year;
wxString msg=wxTheApp->GetAppName()+wxT(" v")+wxString(AutoVersion::FULLVERSION_STRING,wxConvUTF8)+_(" alpha preview ")+date+_("\n\n")+wxT("\u00a9")+_("2011 Mark Watkins & Troy Schultz\n\n");
msg+=_("Website: http://sleepyhead.sourceforge.net\n\n");
msg+=_("License: GNU Public License (GPL)\n\n");
msg+=_("This software is under active development, and is guaranteed to break and change regularly! Use at your own risk.\n\n");
msg+=_("Relying on this softwares' accuracy for making personal medical decisions is probably grounds to get you committed. Please don't do it!\n\n");
msg+=_("Combinations of letters which form those of trademarks belong to those who own them.");
wxMessageBox(msg, _("Welcome to..."),0,this);
}
@ -253,7 +263,7 @@ void SleepyHeadFrame::OnImportSD(wxCommandEvent &event)
if (dd.ShowModal()!=wxID_OK) return;
loader_progress=new wxProgressDialog(wxT("SleepyHead"),wxT("Please Wait..."),100,this, wxPD_APP_MODAL|wxPD_AUTO_HIDE|wxPD_SMOOTH);
loader_progress=new wxProgressDialog(_("SleepyHead"),_("Please Wait..."),100,this, wxPD_APP_MODAL|wxPD_AUTO_HIDE|wxPD_SMOOTH);
loader_progress->Hide();
wxString path=dd.GetPath();

View File

@ -4,7 +4,7 @@
namespace AutoVersion{
//Date Version Types
static const char DATE[] = "04";
static const char DATE[] = "06";
static const char MONTH[] = "06";
static const char YEAR[] = "2011";
static const char UBUNTU_VERSION_STYLE[] = "11.06";
@ -16,17 +16,17 @@ namespace AutoVersion{
//Standard Version Type
static const long MAJOR = 0;
static const long MINOR = 7;
static const long BUILD = 3070;
static const long REVISION = 11358;
static const long BUILD = 3267;
static const long REVISION = 949;
//Miscellaneous Version Types
static const long BUILDS_COUNT = 9005;
#define RC_FILEVERSION 0,7,3070,11358
#define RC_FILEVERSION_STRING "0, 7, 3070, 11358\0"
static const char FULLVERSION_STRING[] = "0.7.3070.11358";
static const long BUILDS_COUNT = 339;
#define RC_FILEVERSION 0,7,3267,949
#define RC_FILEVERSION_STRING "0, 7, 3267, 949\0"
static const char FULLVERSION_STRING[] = "0.7.3267.949";
//These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 62;
static const long BUILD_HISTORY = 0;
}