Skip to content

Commit 5c90c56

Browse files
andyclaude
andcommitted
About ECCE dialog in every Help menu; neutral colour-theme names (#168)
Help > About ECCE... is handled once in ewxApp (menu events propagate from the frame to the app). Themes PNNL/EMSL/PNNL_EMSL are shown as Orange/Green/Orange and Green; the old spellings still select the same colours and old prefs files map to the new combo entries on load. LICENSE is now installed at the ECCE_HOME root for the licence tab. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01A58GUKGuhByHAQG18Q8FPR
1 parent 9ea5a91 commit 5c90c56

19 files changed

Lines changed: 87 additions & 11 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -934,6 +934,11 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/scripts/eccejobmonitor)
934934
COMPONENT client)
935935
endif()
936936

937+
# Read at runtime by Help > About ECCE (ewxApp::OnAbout).
938+
install(FILES ${CMAKE_SOURCE_DIR}/LICENSE
939+
DESTINATION .
940+
COMPONENT client)
941+
937942
# Named by `ecce --help`, so it has to be on the machine.
938943
install(FILES ${CMAKE_SOURCE_DIR}/docs/ENVIRONMENT.md
939944
DESTINATION doc

‎include/wxgui/ewxApp.H‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using std::string;
66

77
#include "wx/app.h"
8+
#include "wx/event.h"
89

910

1011
/**
@@ -27,6 +28,10 @@ class ewxApp : public wxApp
2728

2829
virtual void processGlobalPreferenceChange();
2930

31+
// Help > About ECCE...; reaches the app because unhandled menu
32+
// events propagate from the frame to wxTheApp.
33+
void OnAbout(wxCommandEvent& event);
34+
3035

3136
};
3237

‎siteconfig/AppColors‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
# Four possible themes can be specified or colors can be set individually.
55
# The four themes are:
66
# Classic - Traditional ECCE colors prior to version 5.0
7-
# PNNL - Pacific Northwest National Laborary copper/silver branding
8-
# EMSL - Environmental Molecular Sciences Laboratory green branding
9-
# PNNL_EMSL - Combined copper and green branding
7+
# Orange - copper/silver (formerly PNNL)
8+
# Green - green (formerly EMSL)
9+
# Orange and Green - combined copper and green (formerly PNNL_EMSL)
10+
# The former names are still accepted.
1011
#
1112
# Seven colors can be set individually by #RRGGBB hexadecimal value or by
1213
# the name of color (no "#" character) for some basic colors.
@@ -23,7 +24,7 @@
2324
#
2425
# A "#" character before the name of a theme or color indicates the line
2526
# is commented out and the setting is not applied.
26-
# The following are the color values for the default PNNL color theme as a
27+
# The following are the color values for the default Orange color theme as a
2728
# syntax example:
2829
# Window: #e0e1e1
2930
# Menubar: #b7b8ba
@@ -46,4 +47,4 @@
4647
# individual colors (Window, Input, etc.) can still be done by manually
4748
# editing the file.
4849

49-
Theme: PNNL
50+
Theme: Orange

‎src/apps/basistool/WxBasisToolGUI.C‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ void WxBasisToolGUI::CreateControls()
273273
wxMenu* itemMenu118 = new wxMenu;
274274
itemMenu118->Append(wxID_HELP, _("On Basis Set Tool...\tCTRL+H"), _T(""), wxITEM_NORMAL);
275275
itemMenu118->Append(ID_MENUITEM_WXBASISTOOL_HELP_SUPPORT, _("Support..."), _T(""), wxITEM_NORMAL);
276+
itemMenu118->Append(wxID_ABOUT, _("About ECCE..."), _T(""), wxITEM_NORMAL);
276277
menuBar->Append(itemMenu118, _("Help"));
277278
itemFrame1->SetMenuBar(menuBar);
278279

‎src/apps/builder/BuilderGUI.C‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ void BuilderGUI::CreateControls()
222222
wxMenu* itemMenu45 = new wxMenu;
223223
itemMenu45->Append(wxID_HELP, _("on Builder...\tCtrl+h"), _T(""), wxITEM_NORMAL);
224224
itemMenu45->Append(ID_SUPPORT, _("Support..."), _T(""), wxITEM_NORMAL);
225+
itemMenu45->Append(wxID_ABOUT, _("About ECCE..."), _T(""), wxITEM_NORMAL);
225226
menuBar->Append(itemMenu45, _("Help"));
226227
itemewxTool1->SetMenuBar(menuBar);
227228

‎src/apps/calced/CalcEdGUI.C‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ void CalcEdGUI::CreateControls()
211211
wxMenu* itemMenu8 = new wxMenu;
212212
itemMenu8->Append(wxID_HELP, _("on Electronic Structure Editor..."), _T(""), wxITEM_NORMAL);
213213
itemMenu8->Append(ID_MENU_FEEDBACK, _("Support..."), _T(""), wxITEM_NORMAL);
214+
itemMenu8->Append(wxID_ABOUT, _("About ECCE..."), _T(""), wxITEM_NORMAL);
214215
menuBar->Append(itemMenu8, _("Help"));
215216
itemFrame1->SetMenuBar(menuBar);
216217

‎src/apps/dirdyed/NWDirdyGUI.C‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ void NWDirdyGUI::CreateControls()
245245
menuBar->Append(itemMenu110, _("File"));
246246
wxMenu* itemMenu114 = new wxMenu;
247247
itemMenu114->Append(ID_MENU_FEEDBACK, _("Support..."), _T(""), wxITEM_NORMAL);
248+
itemMenu114->Append(wxID_ABOUT, _("About ECCE..."), _T(""), wxITEM_NORMAL);
248249
itemMenu114->Append(ID_MENU_MDPREP_HELP, _("on NWChem DirDyVTST Editor..."), _T(""), wxITEM_NORMAL);
249250
menuBar->Append(itemMenu114, _("Help"));
250251
itemFrame1->SetMenuBar(menuBar);

‎src/apps/launcher/WxLauncherGUI.C‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ void WxLauncherGUI::CreateControls()
231231
wxMenu* itemMenu139 = new wxMenu;
232232
itemMenu139->Append(wxID_HELP, _("on Launcher..."), _T(""), wxITEM_NORMAL);
233233
itemMenu139->Append(ID_MENUITEM_WXLAUNCHER_HELPSUPPORT, _("Support..."), _T(""), wxITEM_NORMAL);
234+
itemMenu139->Append(wxID_ABOUT, _("About ECCE..."), _T(""), wxITEM_NORMAL);
234235
menuBar->Append(itemMenu139, _("Help"));
235236
itemFrame1->SetMenuBar(menuBar);
236237

‎src/apps/machbrowser/MachineBrowserGUI.C‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ void MachineBrowserGUI::CreateControls()
141141
wxMenu* itemMenu31 = new wxMenu;
142142
itemMenu31->Append(wxID_HELP, _("on Machine Browser..."), _T(""), wxITEM_NORMAL);
143143
itemMenu31->Append(ID_MENUITEM_MACHINEBROWSER_HELPSUPPORT, _("Support..."), _T(""), wxITEM_NORMAL);
144+
itemMenu31->Append(wxID_ABOUT, _("About ECCE..."), _T(""), wxITEM_NORMAL);
144145
menuBar->Append(itemMenu31, _("Help"));
145146
itemFrame1->SetMenuBar(menuBar);
146147

‎src/apps/mdprepare/MDPrepGUI.C‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,7 @@ void MDPrepGUI::CreateControls()
654654
wxMenu* itemMenu537 = new wxMenu;
655655
itemMenu537->Append(ID_MENU_MDPREP_HELP, _("on NWChem MD Prepare..."), _T(""), wxITEM_NORMAL);
656656
itemMenu537->Append(ID_MENU_FEEDBACK, _("Support..."), _T(""), wxITEM_NORMAL);
657+
itemMenu537->Append(wxID_ABOUT, _("About ECCE..."), _T(""), wxITEM_NORMAL);
657658
menuBar->Append(itemMenu537, _("Help"));
658659
itemFrame1->SetMenuBar(menuBar);
659660

0 commit comments

Comments
 (0)