mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-01 13:54:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development'

Browse Source 
Conflicts:
	src/espeakedit.cpp
	src/options.cpp
This commit is contained in:
Reece H. Dunn
2014-01-28 19:04:40 +00:00
parent 6a45e7b162 464e4d7e11
commit 08e6d8dcf6
18 changed files with 443 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/spectdisplay.cpp
+6 -4
View File
@@ -523,12 +523,12 @@ void SpectDisplay::OnKey(wxKeyEvent& event)
if(event.ShiftDown())
{
x_inc = pk_inc1[pk_num];
y_inc = 0x40;
y_inc = 0x20;
}
else
{
x_inc = pk_inc2[pk_num];
y_inc = 0x100;
y_inc = 0x80;
}
switch(key)
@@ -996,7 +996,7 @@ void MyFrame::OnNewWindow(wxCommandEvent& event)
return;
}
wxFileName path = wxFileName(filename);
leaf = path.GetName();
leaf = path.GetName();
setlocale(LC_NUMERIC,"C"); // read numbers in the form 1.23456
spectseq->Load(stream);
@@ -1014,7 +1014,9 @@ void MyFrame::OnNewWindow(wxCommandEvent& event)
SpectDisplay *canvas = new SpectDisplay(screenpages, wxDefaultPosition, wxSize(width, height), spectseq);
screenpages->AddPage(canvas, leaf, true);
canvas->savepath = filename;
currentcanvas = canvas;
currentcanvas = canvas;
notebook->ChangeSelection(0); // select FormatDlg window
}