From e3d8dbb679810e76bfdd39b1191efe5139936d85 Mon Sep 17 00:00:00 2001
From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Thu, 29 Dec 2016 19:43:36 +0000
Subject: [PATCH] Moved frmAbout to source/forms/about

---
 source/forms/about/frmAbout.cpp     | 44 +++++++++++++++++++++++++++++
 source/forms/{ => about}/frmAbout.h | 11 +++++++-
 source/forms/frmAbout.cpp           | 13 ---------
 3 files changed, 54 insertions(+), 14 deletions(-)
 create mode 100644 source/forms/about/frmAbout.cpp
 rename source/forms/{ => about}/frmAbout.h (68%)
 delete mode 100644 source/forms/frmAbout.cpp

diff --git a/source/forms/about/frmAbout.cpp b/source/forms/about/frmAbout.cpp
new file mode 100644
index 0000000..ab9eee5
--- /dev/null
+++ b/source/forms/about/frmAbout.cpp
@@ -0,0 +1,44 @@
+#include "frmAbout.h"
+
+frmAbout::frmAbout( wxWindow* parent )
+:
+frmAboutADT( parent )
+{
+
+}
+
+void frmAbout::CloseAboutWindow( wxCommandEvent& event )
+{
+
+	Close(this);
+	
+}
+
+void frmAbout::SetupAboutWindow()
+{
+
+	// Setup the about window to display information about
+	// Xestia Address Book.
+	
+	wxString VersionLabel, BuildLabel, CopyrightLabel;
+	wxMemoryInputStream istream(bigimgs_aboutimage_png, sizeof(bigimgs_aboutimage_png));
+	wxImage bigimgs_aboutimage_png(istream, wxBITMAP_TYPE_PNG);
+	wxBitmap AboutScreen(bigimgs_aboutimage_png, -1);
+	bmpLogo->SetBitmap(AboutScreen);
+    
+	VersionLabel.Append(wxT("Version "));
+	VersionLabel.Append(wxT(XSDCAL_VERSION));
+    
+	BuildLabel.Append(wxT("Built on "));
+	BuildLabel.Append(wxT(__DATE__));
+	BuildLabel.Append(wxT(" at "));
+	BuildLabel.Append(wxT(__TIME__));
+	BuildLabel.Append(wxT("."));
+    
+	CopyrightLabel.Append(XSDCAL_COPYRIGHT);
+    
+	lblVersion->SetLabel(VersionLabel);
+	lblCompileTime->SetLabel(BuildLabel);
+	lblCopyright->SetLabel(CopyrightLabel);
+    
+}
\ No newline at end of file
diff --git a/source/forms/frmAbout.h b/source/forms/about/frmAbout.h
similarity index 68%
rename from source/forms/frmAbout.h
rename to source/forms/about/frmAbout.h
index d558160..97d3b1c 100644
--- a/source/forms/frmAbout.h
+++ b/source/forms/about/frmAbout.h
@@ -6,7 +6,15 @@
 Subclass of frmAboutADT, which is generated by wxFormBuilder.
 */
 
-#include "../AppXestiaCalendar.h"
+#include <wx/wx.h>
+#include <wx/string.h>
+#include <wx/mstream.h>
+#include <string.h>
+
+#include "../../version.h"
+#include "../../bitmaps.h"
+
+#include "../../AppXestiaCalendar.h"
 
 //// end generated include
 
@@ -19,6 +27,7 @@ class frmAbout : public frmAboutADT
 	public:
 		/** Constructor */
 		frmAbout( wxWindow* parent );
+		void SetupAboutWindow();
 	//// end generated class members
 	
 };
diff --git a/source/forms/frmAbout.cpp b/source/forms/frmAbout.cpp
deleted file mode 100644
index 0d13d80..0000000
--- a/source/forms/frmAbout.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "frmAbout.h"
-
-frmAbout::frmAbout( wxWindow* parent )
-:
-frmAboutADT( parent )
-{
-
-}
-
-void frmAbout::CloseAboutWindow( wxCommandEvent& event )
-{
-// TODO: Implement CloseAboutWindow
-}
-- 
2.39.2