timw4mail/Tyro
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More About dialog updates

Browse Source
This commit is contained in:
Timothy Warren 2019-06-14 10:17:21 -04:00
parent e43ccaf9a3
commit 7635609d13
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/definitions.h
View File

@ -8,6 +8,23 @@ const wxString APP_NAME = "Tyro";
const wxString APP_VENDOR = "Aviat Ion"; const wxString APP_VENDOR = "Aviat Ion";
const wxString APP_VERSION = "0.10.0"; const wxString APP_VERSION = "0.10.0";
const wxString APP_VERSION_MORE = "Pre-release"; 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 // Command-line arguments
#ifdef __clang__ #ifdef __clang__

14
src/widgets/MainFrame.cpp
View File

@ -452,16 +452,13 @@ void MainFrame::OnAbout(wxCommandEvent &WXUNUSED(event))
info.AddArtist("http://dryicons.com: Other icons"); info.AddArtist("http://dryicons.com: Other icons");
#endif #endif
wxString desc = "Tyro, a text editor for all development\n\n" wxString desc = "Tyro, a text editor for all development\n\n";
"System info: \n";
desc += wxString::Format("%s\n", desc += wxString::Format("%s %i.%i (%s)\n",
wxPlatformInfo::GetArchName(plat_info.GetArchitecture()));
desc += wxString::Format("%s %i.%i\n",
wxPlatformInfo::GetOperatingSystemIdName(plat_info.GetOperatingSystemId()), wxPlatformInfo::GetOperatingSystemIdName(plat_info.GetOperatingSystemId()),
plat_info.GetOSMajorVersion(), plat_info.GetOSMajorVersion(),
plat_info.GetOSMinorVersion()); plat_info.GetOSMinorVersion(),
wxPlatformInfo::GetArchName(plat_info.GetArchitecture()));
desc += wxString::Format("%s %i.%i.%i\n", desc += wxString::Format("%s %i.%i.%i\n",
plat_info.GetPortIdName(), plat_info.GetPortIdName(),
@ -493,10 +490,11 @@ void MainFrame::OnAbout(wxCommandEvent &WXUNUSED(event))
} }
info.SetDescription(desc); info.SetDescription(desc);
info.SetLicence(APP_LICENSE);
info.SetCopyright("(C) 2015-2019"); info.SetCopyright("(C) 2015-2019");
wxAboutBox(info); wxAboutBox(info, this);
} }
/** /**

2
src/widgets/TyroMenu.cpp
View File

@ -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_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->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");
} }
/** /**