HeeroYui/edn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] editork work again like as previous

Browse Source
This commit is contained in:
Edouard DUPIN 2013-05-21 09:50:19 +02:00
parent 7b456f1cdb
commit 543cd8ddf1
7 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources/appl/Buffer/BufferText.cpp
View File

@ -1001,7 +1001,7 @@ void BufferText::AddChar(uniChar_t unicodeData)
// normal adding char ... // normal adding char ...
if (true == m_EdnBuf.GetUTF8Mode()) { if (true == m_EdnBuf.GetUTF8Mode()) {
char tmpUTF8[16]; char tmpUTF8[16];
unicode::convertUnicodeToUtf8(unicodeData, tmpUTF8); unicodeData.GetUtf8(tmpUTF8);
etk::Vector<int8_t> tmpVect; etk::Vector<int8_t> tmpVect;
int32_t localOfset = strlen(tmpUTF8); int32_t localOfset = strlen(tmpUTF8);
tmpVect.PushBack((int8_t*)tmpUTF8, localOfset); tmpVect.PushBack((int8_t*)tmpUTF8, localOfset);

10
sources/appl/Buffer/EdnBuf/EdnBuf.cpp
View File

@ -246,7 +246,7 @@ int32_t EdnBuf::Replace(int32_t start, int32_t end, etk::UString &insertText)
tmpInsertText.PushBack(*tmpPointer++); tmpInsertText.PushBack(*tmpPointer++);
} }
} else { } else {
etk::Vector<unsigned int> tmppp = insertText.GetVector(); etk::Vector<uniChar_t> tmppp = insertText.GetVector();
convertUnicodeToIso(m_charsetType, tmppp, tmpInsertText); convertUnicodeToIso(m_charsetType, tmppp, tmpInsertText);
} }
if (tmpInsertText.Size()>0) { if (tmpInsertText.Size()>0) {
@ -622,7 +622,7 @@ int32_t EdnBuf::GetExpandedChar(int32_t &pos, int32_t indent, uniChar_t outUnico
tmp[kkk] = tmpString[kkk]; tmp[kkk] = tmpString[kkk];
tmp[kkk+1] = '\0'; tmp[kkk+1] = '\0';
} }
unicode::convertUtf8ToUnicode(tmp, outUnicode[0]); outUnicode[0].SetUtf8(tmp);
outUnicode[1] = 0; outUnicode[1] = 0;
} else { } else {
outUnicode[0] = '<'; outUnicode[0] = '<';
@ -939,7 +939,7 @@ bool EdnBuf::SearchForward(int32_t startPos, etk::UString &search, int32_t *foun
searchVect.PushBack(*tmpPointer++); searchVect.PushBack(*tmpPointer++);
} }
} else { } else {
etk::Vector<unsigned int> tmppp = search.GetVector(); etk::Vector<etk::UniChar> tmppp = search.GetVector();
convertUnicodeToIso(m_charsetType, tmppp, searchVect); convertUnicodeToIso(m_charsetType, tmppp, searchVect);
} }
// remove the '\0' at the end of the string ... // remove the '\0' at the end of the string ...
@ -995,7 +995,7 @@ bool EdnBuf::SearchBackward(int32_t startPos, etk::UString &search, int32_t *fou
searchVect.PushBack(*tmpPointer++); searchVect.PushBack(*tmpPointer++);
} }
} else { } else {
etk::Vector<unsigned int> tmppp = search.GetVector(); etk::Vector<etk::UniChar> tmppp = search.GetVector();
convertUnicodeToIso(m_charsetType, tmppp, searchVect); convertUnicodeToIso(m_charsetType, tmppp, searchVect);
} }
// remove the '\0' at the end of the string ... // remove the '\0' at the end of the string ...
@ -1146,7 +1146,7 @@ int32_t EdnBuf::LocalInsert(int32_t pos, etk::UString &insertText)
tmpInsertText.PushBack(*tmpPointer++); tmpInsertText.PushBack(*tmpPointer++);
} }
} else { } else {
etk::Vector<unsigned int> tmppp = insertText.GetVector(); etk::Vector<etk::UniChar> tmppp = insertText.GetVector();
convertUnicodeToIso(m_charsetType, tmppp, tmpInsertText); convertUnicodeToIso(m_charsetType, tmppp, tmpInsertText);
} }
if (tmpInsertText.Size()>0) { if (tmpInsertText.Size()>0) {

2
sources/appl/Gui/CodeView.cpp
View File

@ -103,7 +103,7 @@ bool CodeView::CalculateMinSize(void)
void CodeView::CalculateMaxSize(void) void CodeView::CalculateMaxSize(void)
{ {
m_maxSize.setX(2048); m_maxSize.setX(2048);
int32_t letterHeight = m_displayText.CalculateSize('A').y(); int32_t letterHeight = m_displayText.CalculateSize(etk::UniChar('A')).y();
BufferText* tmpBuffer = BufferManager::Get(m_bufferID); BufferText* tmpBuffer = BufferManager::Get(m_bufferID);
if (NULL!=tmpBuffer) { if (NULL!=tmpBuffer) {
m_maxSize.setY(tmpBuffer->GetNumberOfLine() * letterHeight); m_maxSize.setY(tmpBuffer->GetNumberOfLine() * letterHeight);

20
sources/appl/Gui/Search.cpp
View File

@ -75,7 +75,7 @@ Search::Search(void) :
widget::Image* tmpImage = new widget::Image("THEME:GUI:Remove.svg"); widget::Image* tmpImage = new widget::Image("THEME:GUI:Remove.svg");
tmpImage->SetImageSize(ewol::Dimension(vec2(8,8), ewol::Dimension::Millimeter)); tmpImage->SetImageSize(ewol::Dimension(vec2(8,8), ewol::Dimension::Millimeter));
myButtonImage->SetSubWidget(tmpImage); myButtonImage->SetSubWidget(tmpImage);
myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventHideBt); myButtonImage->RegisterOnEvent(this, widget::Button::eventPressed, l_eventHideBt);
SubWidgetAdd(myButtonImage); SubWidgetAdd(myButtonImage);
} }
@ -83,8 +83,8 @@ Search::Search(void) :
if (NULL == m_searchEntry) { if (NULL == m_searchEntry) {
APPL_ERROR("Widget allocation error ==> it will missing in the display"); APPL_ERROR("Widget allocation error ==> it will missing in the display");
} else { } else {
m_searchEntry->RegisterOnEvent(this, ewolEventEntryModify, l_eventSearchEntry); m_searchEntry->RegisterOnEvent(this, widget::Entry::eventModify, l_eventSearchEntry);
m_searchEntry->RegisterOnEvent(this, ewolEventEntryEnter, l_eventSearchEntryEnter); m_searchEntry->RegisterOnEvent(this, widget::Entry::eventEnter, l_eventSearchEntryEnter);
m_searchEntry->SetExpand(bvec2(true,false)); m_searchEntry->SetExpand(bvec2(true,false));
m_searchEntry->SetFill(bvec2(true,false)); m_searchEntry->SetFill(bvec2(true,false));
SubWidgetAdd(m_searchEntry); SubWidgetAdd(m_searchEntry);
@ -97,7 +97,7 @@ Search::Search(void) :
widget::Image* tmpImage = new widget::Image("THEME:GUI:Search.svg"); widget::Image* tmpImage = new widget::Image("THEME:GUI:Search.svg");
tmpImage->SetImageSize(ewol::Dimension(vec2(8,8), ewol::Dimension::Millimeter)); tmpImage->SetImageSize(ewol::Dimension(vec2(8,8), ewol::Dimension::Millimeter));
myButtonImage->SetSubWidget(tmpImage); myButtonImage->SetSubWidget(tmpImage);
myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventSearchBt); myButtonImage->RegisterOnEvent(this, widget::Button::eventPressed, l_eventSearchBt);
SubWidgetAdd(myButtonImage); SubWidgetAdd(myButtonImage);
} }
@ -105,8 +105,8 @@ Search::Search(void) :
if (NULL == m_replaceEntry) { if (NULL == m_replaceEntry) {
APPL_ERROR("Widget allocation error ==> it will missing in the display"); APPL_ERROR("Widget allocation error ==> it will missing in the display");
} else { } else {
m_replaceEntry->RegisterOnEvent(this, ewolEventEntryModify, l_eventReplaceEntry); m_replaceEntry->RegisterOnEvent(this, widget::Entry::eventModify, l_eventReplaceEntry);
m_replaceEntry->RegisterOnEvent(this, ewolEventEntryEnter, l_eventReplaceEntryEnter); m_replaceEntry->RegisterOnEvent(this, widget::Entry::eventEnter, l_eventReplaceEntryEnter);
m_replaceEntry->SetExpand(bvec2(true,false)); m_replaceEntry->SetExpand(bvec2(true,false));
m_replaceEntry->SetFill(bvec2(true,false)); m_replaceEntry->SetFill(bvec2(true,false));
SubWidgetAdd(m_replaceEntry); SubWidgetAdd(m_replaceEntry);
@ -119,7 +119,7 @@ Search::Search(void) :
widget::Image* tmpImage = new widget::Image("THEME:GUI:Replace.svg"); widget::Image* tmpImage = new widget::Image("THEME:GUI:Replace.svg");
tmpImage->SetImageSize(ewol::Dimension(vec2(8,8), ewol::Dimension::Millimeter)); tmpImage->SetImageSize(ewol::Dimension(vec2(8,8), ewol::Dimension::Millimeter));
myButtonImage->SetSubWidget(tmpImage); myButtonImage->SetSubWidget(tmpImage);
myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventReplaceBt); myButtonImage->RegisterOnEvent(this, widget::Button::eventPressed, l_eventReplaceBt);
SubWidgetAdd(myButtonImage); SubWidgetAdd(myButtonImage);
} }
@ -138,7 +138,7 @@ Search::Search(void) :
myButtonImage->SetSubWidgetToggle(tmpImage); myButtonImage->SetSubWidgetToggle(tmpImage);
myButtonImage->SetValue(!SearchData::GetCase()); myButtonImage->SetValue(!SearchData::GetCase());
myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventCaseCb); myButtonImage->RegisterOnEvent(this, widget::Button::eventPressed, l_eventCaseCb);
SubWidgetAdd(myButtonImage); SubWidgetAdd(myButtonImage);
} }
@ -157,7 +157,7 @@ Search::Search(void) :
myButtonImage->SetSubWidgetToggle(tmpImage); myButtonImage->SetSubWidgetToggle(tmpImage);
myButtonImage->SetValue(!SearchData::GetWrap()); myButtonImage->SetValue(!SearchData::GetWrap());
myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventWrapCb); myButtonImage->RegisterOnEvent(this, widget::Button::eventPressed, l_eventWrapCb);
SubWidgetAdd(myButtonImage); SubWidgetAdd(myButtonImage);
} }
@ -176,7 +176,7 @@ Search::Search(void) :
myButtonImage->SetSubWidgetToggle(tmpImage); myButtonImage->SetSubWidgetToggle(tmpImage);
myButtonImage->SetValue(!m_forward); myButtonImage->SetValue(!m_forward);
myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventForwardCb); myButtonImage->RegisterOnEvent(this, widget::Button::eventPressed, l_eventForwardCb);
SubWidgetAdd(myButtonImage); SubWidgetAdd(myButtonImage);
} }

4
sources/appl/Gui/TagFileSelection.cpp
View File

@ -83,7 +83,7 @@ appl::TagFileSelection::TagFileSelection(void)
" </sizer>\n" " </sizer>\n"
"</composer\n")); "</composer\n"));
myWidgetValidate->RegisterOnEvent(this, ewolEventButtonPressed, applEventctagsSelection); myWidgetValidate->RegisterOnEvent(this, widget::Button::eventPressed, applEventctagsSelection);
mySizerHori->SubWidgetAdd(myWidgetValidate); mySizerHori->SubWidgetAdd(myWidgetValidate);
} }
myWidgetCancel = new widget::Button(); myWidgetCancel = new widget::Button();
@ -98,7 +98,7 @@ appl::TagFileSelection::TagFileSelection(void)
" <label>Cancel</label>\n" " <label>Cancel</label>\n"
" </sizer>\n" " </sizer>\n"
"</composer\n")); "</composer\n"));
myWidgetCancel->RegisterOnEvent(this, ewolEventButtonPressed, applEventctagsCancel); myWidgetCancel->RegisterOnEvent(this, widget::Button::eventPressed, applEventctagsCancel);
mySizerHori->SubWidgetAdd(myWidgetCancel); mySizerHori->SubWidgetAdd(myWidgetCancel);
} }
} }

2
sources/appl/Highlight/HighlightPattern.h
View File

@ -63,7 +63,7 @@ class HighlightPattern {
etk::RegExp<etk::Buffer> * m_regExpStop; //!< Stop of Regular Expression etk::RegExp<etk::Buffer> * m_regExpStop; //!< Stop of Regular Expression
bool m_haveStopPatern; //!< Stop patern presence bool m_haveStopPatern; //!< Stop patern presence
bool m_multiline; //!< The patern is multiline bool m_multiline; //!< The patern is multiline
uniChar_t m_escapeChar; //!< Escape char to prevent exeit of patern .... etk::UniChar m_escapeChar; //!< Escape char to prevent exeit of patern ....
etk::Vector<HighlightPattern *> m_subPatern; //!< Under patern of this one etk::Vector<HighlightPattern *> m_subPatern; //!< Under patern of this one
// etk::Vector<HighlightPattern *> m_subColor; //!< Under Color in the start RegExp ... // etk::Vector<HighlightPattern *> m_subColor; //!< Under Color in the start RegExp ...
}; };

1
sources/appl/init.cpp
View File

@ -69,7 +69,6 @@ void APP_Init(void)
APPL_INFO("==> Init "PROJECT_NAME" (START) [" << osMode << "] (" << debugMode << ")"); APPL_INFO("==> Init "PROJECT_NAME" (START) [" << osMode << "] (" << debugMode << ")");
ewol::ChangeSize(ivec2(800, 600)); ewol::ChangeSize(ivec2(800, 600));
etk::InitDefaultFolder(PROJECT_NAME);
#ifdef __TARGET_OS__Android #ifdef __TARGET_OS__Android
ewol::config::FontSetDefault("FreeSerif", 19); ewol::config::FontSetDefault("FreeSerif", 19);
#else #else