66#include " speech.h"
77
88#include < CLI/CLI.hpp>
9+ #include < cstring>
910#include < spdlog/spdlog.h>
1011#include < string>
1112#include < wx/string.h>
1213
14+ static std::string PROGRAM_TITLE = std::format(" SIM {}" , SIM_FULL_VERSION);
15+
1316MainFrame::MainFrame (const wxString& title, int cliVoiceIndex, int cliOutputDeviceIndex, bool cliIsHelpRequested)
1417 : wxFrame(nullptr , wxID_ANY, title) {
1518 m_cliVoiceIndex = cliVoiceIndex;
@@ -115,7 +118,7 @@ void MainFrame::OnEnterPress(wxCommandEvent& event) {
115118 return ;
116119 }
117120 wxString messageText = m_messageField->GetValue ();
118- std::string text = std::string (messageText.utf8_str ());
121+ auto text = std::string (messageText.utf8_str ());
119122 if (!Speech::GetInstance ().speak (text.c_str ())) {
120123 wxMessageBox (" This voice either does not work with the program or crashes it. Please select another voice." ,
121124 " Error! The selected SAPI voice is not supported." , 5L , m_panel);
@@ -125,14 +128,16 @@ void MainFrame::OnEnterPress(wxCommandEvent& event) {
125128}
126129
127130void MainFrame::OnMessageFieldKeyDown (wxKeyEvent& event) {
128- std::string text = std::string (m_messageField->GetValue ().utf8_str ());
131+ auto text = std::string (m_messageField->GetValue ().utf8_str ());
129132 switch (event.GetKeyCode ()) {
130133 case WXK_UP:
131134 m_messageField->SetValue (wxString::FromUTF8 (g_HistoryStorage.getPreviousByText (text)));
132135 break ;
133136 case WXK_DOWN:
134137 m_messageField->SetValue (wxString::FromUTF8 (g_HistoryStorage.getNextByText (text)));
135138 break ;
139+ default :
140+ break ;
136141 }
137142 event.Skip ();
138143}
@@ -168,7 +173,7 @@ bool MyApp::OnInit() {
168173 bool cliIsHelpRequested = false ;
169174 CLI11_PARSE (cliApp, MyApp::argc, argv);
170175 InitializeLogging (MyApp::argc, MyApp::argv, cliIsDebugEnabled);
171- auto * frame = new MainFrame (" SIM test " , cliVoiceIndex, cliOutputDeviceIndex, cliIsHelpRequested);
176+ auto * frame = new MainFrame (PROGRAM_TITLE , cliVoiceIndex, cliOutputDeviceIndex, cliIsHelpRequested);
172177 frame->Show (true );
173178 spdlog::debug (" Main window shown" );
174179 return true ;
0 commit comments