Amebis/ZRCola
Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

Character select dialog saves history in legacy format too now

Browse Source
This commit is contained in:
Simon Rozman 2017-03-31 13:17:25 +02:00
parent 08397415c4
commit 15e5f2d9e2
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ZRCola/zrcolachrslct.cpp
View File

@ -805,17 +805,20 @@ void wxPersistentZRColaCharSelect::Save() const
auto wnd = static_cast<const wxZRColaCharSelect*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor. auto wnd = static_cast<const wxZRColaCharSelect*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
auto app = dynamic_cast<ZRColaApp*>(wxTheApp); auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
wxString val; wxString str, str2;
auto &recent = wnd->m_gridRecent->GetCharacters(); auto &recent = wnd->m_gridRecent->GetCharacters();
for (size_t i = 0, n = recent.GetCount(); i < n; i++) { for (size_t i = 0, n = recent.GetCount(); i < n; i++) {
if (i) val += wxT('|'); if (i) str2 += wxT('|');
auto &chr = recent[i]; auto &chr = recent[i];
for (size_t j = 0, m = chr.Length(); j < m; j++) { for (size_t j = 0, m = chr.Length(); j < m; j++) {
if (j) val += wxT('+'); if (j) str2 += wxT('+');
val += wxString::Format(wxT("%04X"), chr[j]); str2 += wxString::Format(wxT("%04X"), chr[j]);
} }
if (chr.Length() == 1)
str += chr[0];
} }
SaveValue(wxT("recentChars2"), val); SaveValue(wxT("recentChars" ), str ); // Save in legacy format for backward compatibility.
SaveValue(wxT("recentChars2"), str2); // Save in native format
for (size_t i = 0, n = app->m_cc_db.idxRank.size(); i < n; i++) { for (size_t i = 0, n = app->m_cc_db.idxRank.size(); i < n; i++) {
const auto &cc = app->m_cc_db.idxRank[i]; const auto &cc = app->m_cc_db.idxRank[i];
@ -833,19 +836,19 @@ bool wxPersistentZRColaCharSelect::Restore()
auto wnd = dynamic_cast<wxZRColaCharSelect*>(GetWindow()); auto wnd = dynamic_cast<wxZRColaCharSelect*>(GetWindow());
auto app = dynamic_cast<ZRColaApp*>(wxTheApp); auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
wxString recent; wxString str;
if (RestoreValue(wxT("recentChars2"), &recent)) { if (RestoreValue(wxT("recentChars2"), &str)) {
// Native format found. // Native format found.
wxArrayString val; wxArrayString val;
wxString chr; wxString chr;
wchar_t c = 0; wchar_t c = 0;
for (size_t i = 0, n = recent.Length();; i++) { for (size_t i = 0, n = str.Length();; i++) {
if (i >= n) { if (i >= n) {
if (c) { chr += c; c = 0; } if (c) { chr += c; c = 0; }
if (!chr.IsEmpty()) { val.Add(chr); chr.Clear(); } if (!chr.IsEmpty()) { val.Add(chr); chr.Clear(); }
break; break;
} else { } else {
wxStringCharType r = recent[i]; wxStringCharType r = str[i];
if (wxT('0') <= r && r <= wxT('9')) c = (c << 4) | (r - wxT('0') ); if (wxT('0') <= r && r <= wxT('9')) c = (c << 4) | (r - wxT('0') );
else if (wxT('A') <= r && r <= wxT('F')) c = (c << 4) | (r - wxT('A') + 10); else if (wxT('A') <= r && r <= wxT('F')) c = (c << 4) | (r - wxT('A') + 10);
else if (wxT('a') <= r && r <= wxT('f')) c = (c << 4) | (r - wxT('a') + 10); else if (wxT('a') <= r && r <= wxT('f')) c = (c << 4) | (r - wxT('a') + 10);
@ -859,11 +862,11 @@ bool wxPersistentZRColaCharSelect::Restore()
} }
} }
wnd->m_gridRecent->SetCharacters(val); wnd->m_gridRecent->SetCharacters(val);
} else if (RestoreValue(wxT("recentChars"), &recent)) { } else if (RestoreValue(wxT("recentChars"), &str)) {
// Legacy value found. // Legacy value found.
wxArrayString val; wxArrayString val;
for (size_t i = 0, n = recent.Length(); i < n; i++) for (size_t i = 0, n = str.Length(); i < n; i++)
val.Add(wxString(1, recent[i])); val.Add(wxString(1, str[i]));
wnd->m_gridRecent->SetCharacters(val); wnd->m_gridRecent->SetCharacters(val);
} }