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

ZRCola connected to libZRCola for composition and decomposition.

Browse Source
This commit is contained in:
Simon Rozman 2016-02-08 14:58:25 +01:00
parent aad2b347a6
commit 3f94c919ba
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZRCola/ZRCola.props
View File

@ -10,7 +10,7 @@
<OutputFile>..\output\locale\%(Filename)\$(ProjectName).mo</OutputFile> <OutputFile>..\output\locale\%(Filename)\$(ProjectName).mo</OutputFile>
</POCompile> </POCompile>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>..\lib\wxExtend\include</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\lib\wxExtend\include;..\lib\libZRCola\include</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup /> <ItemGroup />

3
ZRCola/ZRCola.vcxproj
View File

@ -93,6 +93,9 @@
<ClInclude Include="zrcolagui.h" /> <ClInclude Include="zrcolagui.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\lib\libZRCola\build\libZRCola.vcxproj">
<Project>{3c61929e-7289-4101-8d0a-da22d6e1aea8}</Project>
</ProjectReference>
<ProjectReference Include="..\lib\wxExtend\build\wxExtend.vcxproj"> <ProjectReference Include="..\lib\wxExtend\build\wxExtend.vcxproj">
<Project>{a3a36689-ac35-4026-93da-a3ba0c0e767c}</Project> <Project>{a3a36689-ac35-4026-93da-a3ba0c0e767c}</Project>
</ProjectReference> </ProjectReference>

4
ZRCola/stdafx.h
View File

@ -24,7 +24,11 @@
#include "zrcolacomppnl.h" #include "zrcolacomppnl.h"
#include "zrcolafrm.h" #include "zrcolafrm.h"
#include <zrcola\compose.h>
#include <zrcola\decompose.h>
#include <wx/msgdlg.h> #include <wx/msgdlg.h>
#include <wxex/common.h> #include <wxex/common.h>
#include <string>
#include <vector> #include <vector>

14
ZRCola/zrcolacomppnl.cpp
View File

@ -42,9 +42,12 @@ void wxZRColaComposerPanel::OnDecomposedText(wxCommandEvent& event)
// We are being updated by wxZRColaComposerPanel::OnComposedText() // We are being updated by wxZRColaComposerPanel::OnComposedText()
event.Skip(); event.Skip();
} else { } else {
// TODO: Do the real ZRCola composition here. std::wstring composed;
ZRCola::Compose(m_decomposed->GetValue(), (size_t)-1, composed);
// Update composed text.
m_progress = true; m_progress = true;
m_composed->SetValue(m_decomposed->GetValue()); m_composed->SetValue(composed);
event.Skip(); event.Skip();
m_progress = false; m_progress = false;
} }
@ -57,9 +60,12 @@ void wxZRColaComposerPanel::OnComposedText(wxCommandEvent& event)
// We are being updated by wxZRColaComposerPanel::OnDecomposedText() // We are being updated by wxZRColaComposerPanel::OnDecomposedText()
event.Skip(); event.Skip();
} else { } else {
// TODO: Do the real ZRCola decomposition here. std::wstring decomposed;
ZRCola::Decompose(m_composed->GetValue(), (size_t)-1, decomposed);
// Update decomposed text.
m_progress = true; m_progress = true;
m_decomposed->SetValue(m_composed->GetValue()); m_decomposed->SetValue(decomposed);
event.Skip(); event.Skip();
m_progress = false; m_progress = false;
} }