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

[DEV] update the change on 'enum' to 'enum class'

Browse Source
This commit is contained in:
Edouard DUPIN 2016-04-29 23:16:07 +02:00
parent c0de59ac9a
commit 0b84458985
7 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,7 +213,7 @@ bool BufferView::getElement(int32_t _colomn, int32_t _raw, std::string& _myTextT
} }
bool BufferView::onItemEvent(int32_t _IdInput, enum gale::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y) { bool BufferView::onItemEvent(int32_t _IdInput, enum gale::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y) {
if (1 == _IdInput && _typeEvent == gale::key::status_single) { if (1 == _IdInput && _typeEvent == gale::key::status::pressSingle) {
APPL_INFO("Event on List : IdInput=" << _IdInput << " colomn=" << _colomn << " raw=" << _raw ); APPL_INFO("Event on List : IdInput=" << _IdInput << " colomn=" << _colomn << " raw=" << _raw );
if( _raw >= 0 if( _raw >= 0
&& _raw<(int64_t)m_list.size()) { && _raw<(int64_t)m_list.size()) {

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

@ -126,7 +126,7 @@ void MainWindows::init() {
ewol::widget::SpacerShared mySpacer = ewol::widget::Spacer::create(); ewol::widget::SpacerShared mySpacer = ewol::widget::Spacer::create();
mySpacer->propertyName.set("appl-Buffer-viewer-separator"); mySpacer->propertyName.set("appl-Buffer-viewer-separator");
mySpacer->propertyColor.set(etk::color::black); mySpacer->propertyColor.set(etk::color::black);
mySpacer->propertyMinSize.set(gale::Dimension(vec2(2,2), gale::Dimension::Pixel)); mySpacer->propertyMinSize.set(gale::Dimension(vec2(2,2), gale::distance::pixel));
mySpacer->propertyExpand.set(bvec2(false,true)); mySpacer->propertyExpand.set(bvec2(false,true));
mySpacer->propertyFill.set(bvec2(true,true)); mySpacer->propertyFill.set(bvec2(true,true));
mySpacer->propertyHide.set(true); mySpacer->propertyHide.set(true);
@ -152,7 +152,7 @@ void MainWindows::init() {
mySpacer = ewol::widget::Spacer::create(); mySpacer = ewol::widget::Spacer::create();
mySpacer->propertyName.set("appl-text-separator"); mySpacer->propertyName.set("appl-text-separator");
mySpacer->propertyColor.set(etk::color::black); mySpacer->propertyColor.set(etk::color::black);
mySpacer->propertyMinSize.set(gale::Dimension(vec2(2,2), gale::Dimension::Pixel)); mySpacer->propertyMinSize.set(gale::Dimension(vec2(2,2), gale::distance::pixel));
mySpacer->propertyExpand.set(bvec2(true,false)); mySpacer->propertyExpand.set(bvec2(true,false));
mySpacer->propertyFill.set(bvec2(true,true)); mySpacer->propertyFill.set(bvec2(true,true));
mySpacer->propertyHide.set(true); mySpacer->propertyHide.set(true);

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

@ -80,7 +80,7 @@ bool appl::TagFileList::getElement(int32_t _colomn, int32_t _raw, std::string& _
bool appl::TagFileList::onItemEvent(int32_t _IdInput, enum gale::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y) { bool appl::TagFileList::onItemEvent(int32_t _IdInput, enum gale::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y) {
if (_typeEvent == gale::key::status_single) { if (_typeEvent == gale::key::status::pressSingle) {
EWOL_INFO("Event on List : IdInput=" << _IdInput << " colomn=" << _colomn << " raw=" << _raw ); EWOL_INFO("Event on List : IdInput=" << _IdInput << " colomn=" << _colomn << " raw=" << _raw );
if (_IdInput == 1) { if (_IdInput == 1) {
int32_t previousRaw = m_selectedLine; int32_t previousRaw = m_selectedLine;

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

@ -35,11 +35,11 @@ void appl::TagFileSelection::init() {
ewol::widget::PopUp::init(); ewol::widget::PopUp::init();
ewol::widget::SizerShared mySizerVert; ewol::widget::SizerShared mySizerVert;
#if defined(__TARGET_OS__Android) #if defined(__TARGET_OS__Android)
propertyMinSize.set(gale::Dimension(vec2(90,90), gale::Dimension::Pourcent)); propertyMinSize.set(gale::Dimension(vec2(90,90), gale::distance::pourcent));
#elif defined(__TARGET_OS__Windows) #elif defined(__TARGET_OS__Windows)
propertyMinSize.set(gale::Dimension(vec2(80,80), gale::Dimension::Pourcent)); propertyMinSize.set(gale::Dimension(vec2(80,80), gale::distance::pourcent));
#else #else
propertyMinSize.set(gale::Dimension(vec2(80,80), gale::Dimension::Pourcent)); propertyMinSize.set(gale::Dimension(vec2(80,80), gale::distance::pourcent));
#endif #endif
mySizerVert = ewol::widget::Sizer::create(); mySizerVert = ewol::widget::Sizer::create();

46
sources/appl/Gui/TextViewer.cpp
View File

@ -391,9 +391,9 @@ bool appl::TextViewer::onEventEntry(const ewol::event::Entry& _event) {
return true; return true;
} }
// just forward event == > manage directly in the buffer // just forward event == > manage directly in the buffer
if (_event.getType() == gale::key::keyboard_char) { if (_event.getType() == gale::key::keyboard::character) {
//APPL_DEBUG("KB EVENT : \"" << UTF8_data << "\" size=" << strlen(UTF8_data) << "type=" << (int32_t)typeEvent); //APPL_DEBUG("KB EVENT : \"" << UTF8_data << "\" size=" << strlen(UTF8_data) << "type=" << (int32_t)typeEvent);
if (_event.getStatus() != gale::key::status_down) { if (_event.getStatus() != gale::key::status::down) {
return false; return false;
} }
char32_t localValue = _event.getChar(); char32_t localValue = _event.getChar();
@ -443,44 +443,44 @@ bool appl::TextViewer::onEventEntry(const ewol::event::Entry& _event) {
return true; return true;
} }
// move events ... // move events ...
if (_event.getStatus() == gale::key::status_down) { if (_event.getStatus() == gale::key::status::down) {
// selection when shift is set: // selection when shift is set:
m_buffer->setSelectMode(_event.getSpecialKey().getShift()); m_buffer->setSelectMode(_event.getSpecialKey().getShift());
// check selection event ... // check selection event ...
switch(_event.getType()) { switch(_event.getType()) {
case gale::key::keyboard_insert: case gale::key::keyboard::insert:
m_insertMode = m_insertMode==true?false:true; m_insertMode = m_insertMode==true?false:true;
markToRedraw(); markToRedraw();
break; break;
case gale::key::keyboard_left: case gale::key::keyboard::left:
//APPL_INFO("keyEvent : <LEFT>"); //APPL_INFO("keyEvent : <LEFT>");
moveCursorLeft(); moveCursorLeft();
break; break;
case gale::key::keyboard_right: case gale::key::keyboard::right:
//APPL_INFO("keyEvent : <RIGHT>"); //APPL_INFO("keyEvent : <RIGHT>");
moveCursorRight(); moveCursorRight();
break; break;
case gale::key::keyboard_up: case gale::key::keyboard::up:
//APPL_INFO("keyEvent : <UP>"); //APPL_INFO("keyEvent : <UP>");
moveCursorUp(1); moveCursorUp(1);
break; break;
case gale::key::keyboard_down: case gale::key::keyboard::down:
//APPL_INFO("keyEvent : <DOWN>"); //APPL_INFO("keyEvent : <DOWN>");
moveCursorDown(1); moveCursorDown(1);
break; break;
case gale::key::keyboard_pageUp: case gale::key::keyboard::pageUp:
//APPL_INFO("keyEvent : <PAGE-UP>"); //APPL_INFO("keyEvent : <PAGE-UP>");
moveCursorUp(15); // TODO : Set the real number of line ... moveCursorUp(15); // TODO : Set the real number of line ...
break; break;
case gale::key::keyboard_pageDown: case gale::key::keyboard::pageDown:
//APPL_INFO("keyEvent : <PAGE-DOWN>"); //APPL_INFO("keyEvent : <PAGE-DOWN>");
moveCursorDown(15); // TODO : Set the real number of line ... moveCursorDown(15); // TODO : Set the real number of line ...
break; break;
case gale::key::keyboard_start: case gale::key::keyboard::start:
//APPL_INFO("keyEvent : <Start of line>"); //APPL_INFO("keyEvent : <Start of line>");
moveCursorLeft(moveEnd); moveCursorLeft(moveEnd);
break; break;
case gale::key::keyboard_end: case gale::key::keyboard::end:
//APPL_INFO("keyEvent : <End of line>"); //APPL_INFO("keyEvent : <End of line>");
moveCursorRight(moveEnd); moveCursorRight(moveEnd);
break; break;
@ -494,7 +494,7 @@ bool appl::TextViewer::onEventEntry(const ewol::event::Entry& _event) {
bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) { bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) {
if ( _event.getId() != 0 if ( _event.getId() != 0
&& _event.getStatus() == gale::key::status_down) { && _event.getStatus() == gale::key::status::down) {
keepFocus(); keepFocus();
} }
//tic(); //tic();
@ -522,7 +522,7 @@ bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) {
relativePos.setX(0); relativePos.setX(0);
} }
if ( _event.getId() == 12 if ( _event.getId() == 12
&& _event.getStatus() == gale::key::status_single) { && _event.getStatus() == gale::key::status::pressSingle) {
APPL_TODO("RAT5 SAVE button ==> TODO implement"); APPL_TODO("RAT5 SAVE button ==> TODO implement");
// Rat5 save event // Rat5 save event
//sendMultiCast(ednMsgGuiSave, "current"); //sendMultiCast(ednMsgGuiSave, "current");
@ -532,7 +532,7 @@ bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) {
if (_event.getId() == 1) { if (_event.getId() == 1) {
// mouse selection : // mouse selection :
//if (_event.getType() == gale::key::typeMouse) { //if (_event.getType() == gale::key::typeMouse) {
if (_event.getStatus() == gale::key::status_down) { if (_event.getStatus() == gale::key::status::down) {
//if (_event.getSpecialKey().isSetShift() == false) { //if (_event.getSpecialKey().isSetShift() == false) {
appl::Buffer::Iterator newPos = getMousePosition(relativePos); appl::Buffer::Iterator newPos = getMousePosition(relativePos);
m_buffer->setSelectMode(false); m_buffer->setSelectMode(false);
@ -541,7 +541,7 @@ bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) {
markToRedraw(); markToRedraw();
return true; return true;
//} //}
} else if (_event.getStatus() == gale::key::status_up) { } else if (_event.getStatus() == gale::key::status::up) {
appl::Buffer::Iterator newPos = getMousePosition(relativePos); appl::Buffer::Iterator newPos = getMousePosition(relativePos);
moveCursor(newPos); moveCursor(newPos);
m_buffer->setSelectMode(false); m_buffer->setSelectMode(false);
@ -555,15 +555,15 @@ bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) {
return true; return true;
} }
//} //}
if (_event.getStatus() == gale::key::status_single) { if (_event.getStatus() == gale::key::status::pressSingle) {
if ( _event.getType() == gale::key::type_mouse if ( _event.getType() == gale::key::type::mouse
|| _event.getType() == gale::key::type_finger) { || _event.getType() == gale::key::type::finger) {
appl::Buffer::Iterator newPos = getMousePosition(relativePos); appl::Buffer::Iterator newPos = getMousePosition(relativePos);
moveCursor(newPos); moveCursor(newPos);
markToRedraw(); markToRedraw();
return true; return true;
} }
} else if (_event.getStatus() == gale::key::status_double) { } else if (_event.getStatus() == gale::key::status::pressDouble) {
mouseEventDouble(); mouseEventDouble();
// Copy selection : // Copy selection :
std::string value; std::string value;
@ -573,7 +573,7 @@ bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) {
} }
markToRedraw(); markToRedraw();
return true; return true;
} else if (_event.getStatus() == gale::key::status_triple) { } else if (_event.getStatus() == gale::key::status::pressTriple) {
mouseEventTriple(); mouseEventTriple();
// Copy selection : // Copy selection :
std::string value; std::string value;
@ -583,7 +583,7 @@ bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) {
} }
markToRedraw(); markToRedraw();
return true; return true;
} else if (_event.getStatus() == gale::key::status_move) { } else if (_event.getStatus() == gale::key::status::move) {
if (m_buffer->getSelectMode() == true) { if (m_buffer->getSelectMode() == true) {
//int64_t timeStart = ewol::getTime(); //int64_t timeStart = ewol::getTime();
appl::Buffer::Iterator newPos = getMousePosition(relativePos); appl::Buffer::Iterator newPos = getMousePosition(relativePos);
@ -601,7 +601,7 @@ bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) {
} }
} }
} else if (2 == _event.getId()) { } else if (2 == _event.getId()) {
if (gale::key::status_single == _event.getStatus()) { if (gale::key::status::pressSingle == _event.getStatus()) {
appl::Buffer::Iterator newPos = getMousePosition(relativePos); appl::Buffer::Iterator newPos = getMousePosition(relativePos);
moveCursor(newPos); moveCursor(newPos);
gale::context::clipBoard::request(gale::context::clipBoard::clipboardSelection); gale::context::clipBoard::request(gale::context::clipBoard::clipboardSelection);

4
sources/appl/TextPluginAutoIndent.cpp
View File

@ -28,10 +28,10 @@ bool appl::TextPluginAutoIndent::onEventEntry(appl::TextViewer& _textDrawer,
} }
//APPL_DEBUG("KB EVENT : " << _event); //APPL_DEBUG("KB EVENT : " << _event);
// just forward event == > manage directly in the buffer // just forward event == > manage directly in the buffer
if (_event.getType() != gale::key::keyboard_char) { if (_event.getType() != gale::key::keyboard::character) {
return false; return false;
} }
if (_event.getStatus() != gale::key::status_down) { if (_event.getStatus() != gale::key::status::down) {
return false; return false;
} }
if (_event.getChar() != u32char::Return) { if (_event.getChar() != u32char::Return) {

4
sources/appl/TextPluginMultiLineTab.cpp
View File

@ -24,11 +24,11 @@ bool appl::TextPluginMultiLineTab::onEventEntry(appl::TextViewer& _textDrawer,
if (isEnable() == false) { if (isEnable() == false) {
return false; return false;
} }
if (_event.getType() != gale::key::keyboard_char) { if (_event.getType() != gale::key::keyboard::character) {
return false; return false;
} }
//APPL_DEBUG("KB EVENT : \"" << UTF8_data << "\" size=" << strlen(UTF8_data) << "type=" << (int32_t)typeEvent); //APPL_DEBUG("KB EVENT : \"" << UTF8_data << "\" size=" << strlen(UTF8_data) << "type=" << (int32_t)typeEvent);
if (_event.getStatus() != gale::key::status_down) { if (_event.getStatus() != gale::key::status::down) {
return false; return false;
} }
char32_t localValue = _event.getChar(); char32_t localValue = _event.getChar();