From 7635609d13a63765185fb028e57ddb36136ebbc4 Mon Sep 17 00:00:00 2001
From: Timothy Warren <twarren@nabancard.com>
Date: Fri, 14 Jun 2019 10:17:21 -0400
Subject: [PATCH] More About dialog updates

---
 src/definitions.h         | 17 +++++++++++++++++
 src/widgets/MainFrame.cpp | 16 +++++++---------
 src/widgets/TyroMenu.cpp  |  2 +-
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/definitions.h b/src/definitions.h
index d1043ce..69740ac 100644
--- a/src/definitions.h
+++ b/src/definitions.h
@@ -8,6 +8,23 @@ const wxString APP_NAME = "Tyro";
 const wxString APP_VENDOR = "Aviat Ion";
 const wxString APP_VERSION = "0.10.0";
 const wxString APP_VERSION_MORE = "Pre-release";
+const wxString APP_LICENSE = "Copyright 2019 Timothy J. Warren\n"
+							 "\n"
+							 "Permission is hereby granted, free of charge, to any person obtaining a copy of this software \n"
+							 "and associated documentation files (the \"Software\"), to deal in the Software without \n"
+							 "restriction, including without limitation the rights to use, copy, modify, merge, publish, \n"
+							 "distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the \n"
+							 "Software is furnished to do so, subject to the following conditions:\n"
+							 "\n"
+							 "The above copyright notice and this permission notice shall be included in all copies or \n"
+							 "substantial portions of the Software.\n"
+							 "\n"
+							 "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, \n"
+							 "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR \n"
+							 "PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR \n"
+							 "ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, \n"
+							 "ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS \n"
+							 "IN THE SOFTWARE.";
 
 // Command-line arguments
 #ifdef __clang__
diff --git a/src/widgets/MainFrame.cpp b/src/widgets/MainFrame.cpp
index c30079f..c80c171 100644
--- a/src/widgets/MainFrame.cpp
+++ b/src/widgets/MainFrame.cpp
@@ -452,16 +452,13 @@ void MainFrame::OnAbout(wxCommandEvent &WXUNUSED(event))
 	info.AddArtist("http://dryicons.com: Other icons");
 #endif
 
-	wxString desc = "Tyro, a text editor for all development\n\n"
-		"System info: \n";
+	wxString desc = "Tyro, a text editor for all development\n\n";
 
-	desc += wxString::Format("%s\n",
-		wxPlatformInfo::GetArchName(plat_info.GetArchitecture()));
-
-	desc += wxString::Format("%s %i.%i\n",
+	desc += wxString::Format("%s %i.%i (%s)\n",
 		wxPlatformInfo::GetOperatingSystemIdName(plat_info.GetOperatingSystemId()),
 		plat_info.GetOSMajorVersion(),
-		plat_info.GetOSMinorVersion());
+		plat_info.GetOSMinorVersion(),
+		wxPlatformInfo::GetArchName(plat_info.GetArchitecture()));
 
 	desc += wxString::Format("%s %i.%i.%i\n",
 		plat_info.GetPortIdName(),
@@ -493,10 +490,11 @@ void MainFrame::OnAbout(wxCommandEvent &WXUNUSED(event))
 	}
 
 	info.SetDescription(desc);
+	info.SetLicence(APP_LICENSE);
 
-	info.SetCopyright(" (C) 2015-2019");
+	info.SetCopyright("(C) 2015-2019");
 
-	wxAboutBox(info);
+	wxAboutBox(info, this);
 }
 
 /**
diff --git a/src/widgets/TyroMenu.cpp b/src/widgets/TyroMenu.cpp
index 2208187..3289389 100644
--- a/src/widgets/TyroMenu.cpp
+++ b/src/widgets/TyroMenu.cpp
@@ -72,7 +72,7 @@ void TyroMenu::SetupMainMenus()
 	this->viewMenu->AppendCheckItem(myID_VIEW_LINE_ENDINGS, "Show line endings", "Toggle visibility of line ending characters");
 	this->viewMenu->AppendCheckItem(myID_LINE_WRAP, "Word Wrap", "Toggle wrapping of long lines");
 	
-	this->helpMenu->Append(wxID_ABOUT, "&About...\tF1", "Show info about this application");
+	this->helpMenu->Append(wxID_ABOUT, "About Tyro", "Show info about this application");
 }
 
 /**