neox
/
xml-copy-editor-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Corrected style file paths

This commit is contained in:
Zane U. Ji 2012-08-10 23:50:49 +08:00
parent 9a3a9c6280
commit 89feff7811
6 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/rulesets/Default dictionary.xml → src/rulesets/Default_dictionary.xml
View File

0
src/rulesets/Default dictionary and style.xml → src/rulesets/Default_dictionary_and_style.xml
View File

0
src/rulesets/Default style.xml → src/rulesets/Default_style.xml
View File

0
src/rulesets/Ize and yse.xml → src/rulesets/Ize_and_yse.xml
View File

0
src/rulesets/White space.xml → src/rulesets/White_space.xml
View File

30
src/styledialog.cpp
View File

@ -108,16 +108,16 @@ StyleDialog::StyleDialog (
size, size,
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxMAXIMIZE_BOX ), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxMAXIMIZE_BOX ),
bufferUtf8 ( bufferParameterUtf8 ), bufferUtf8 ( bufferParameterUtf8 ),
#if !defined(USE_ENCHANT) && defined(__WXMSW__)
aspellDataPath ( aspellDataPathParameter ),
aspellDictPath ( aspellDictPathParameter ),
#endif
fileName ( fileNameParameter ), fileName ( fileNameParameter ),
ruleSetDirectory ( ruleSetDirectoryParameter ), ruleSetDirectory ( ruleSetDirectoryParameter ),
filterDirectory ( filterDirectoryParameter ), filterDirectory ( filterDirectoryParameter ),
browser ( browserParameter ), browser ( browserParameter ),
ruleSetPreset ( ruleSetPresetParameter ), ruleSetPreset ( ruleSetPresetParameter ),
filterPreset ( filterPresetParameter ), filterPreset ( filterPresetParameter ),
#if !defined(USE_ENCHANT) && defined(__WXMSW__)
aspellDataPath ( aspellDataPathParameter ),
aspellDictPath ( aspellDictPathParameter ),
#endif
type(typeParameter), type(typeParameter),
readOnly ( readOnlyParameter ) readOnly ( readOnlyParameter )
{ {
@ -459,27 +459,21 @@ void StyleDialog::OnReport ( wxCommandEvent& event )
ruleSet.Replace ( _(" "), _T("_") ); ruleSet.Replace ( _(" "), _T("_") );
filter = filterPreset + _T ( ".xml" ); filter = filterPreset + _T ( ".xml" );
std::string ruleSetDirectoryUtf8, std::string ruleSetDirectoryLocal ( ruleSetDirectory.mb_str ( wxConvLocal ) );
ruleSetUtf8, std::string ruleSetUtf8 ( ruleSet.mb_str ( wxConvUTF8 ) );
filterDirectoryUtf8, std::string filterDirectoryLocal ( filterDirectory.mb_str ( wxConvLocal ) );
filterUtf8, std::string filterUtf8 ( filter.mb_str ( wxConvUTF8 ) );
pathSeparatorUtf8;
ruleSetDirectoryUtf8 = ruleSetDirectory.mb_str ( wxConvUTF8 );
ruleSetUtf8 = ruleSet.mb_str ( wxConvUTF8 );
filterDirectoryUtf8 = filterDirectory.mb_str ( wxConvUTF8 );
filterUtf8 = filter.mb_str ( wxConvUTF8 );
wxString separator = wxFileName::GetPathSeparator(); wxString separator = wxFileName::GetPathSeparator();
pathSeparatorUtf8 = separator.mb_str ( wxConvUTF8 ); std::string pathSeparatorLocal ( separator.mb_str ( wxConvLocal ) );
std::auto_ptr<HouseStyle> hs ( new HouseStyle ( std::auto_ptr<HouseStyle> hs ( new HouseStyle (
(type == ID_TYPE_SPELL) ? HS_TYPE_SPELL : HS_TYPE_STYLE, (type == ID_TYPE_SPELL) ? HS_TYPE_SPELL : HS_TYPE_STYLE,
bufferUtf8, bufferUtf8,
ruleSetDirectoryUtf8, ruleSetDirectoryLocal,
ruleSetUtf8, ruleSetUtf8,
filterDirectoryUtf8, filterDirectoryLocal,
filterUtf8, filterUtf8,
pathSeparatorUtf8, pathSeparatorLocal,
#ifdef __WXMSW__ #ifdef __WXMSW__
aspellDataPath, aspellDataPath,
aspellDictPath, aspellDictPath,