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

[DEV] update at the new low level gale interface

Browse Source
This commit is contained in:
Edouard DUPIN
2015-08-11 23:21:41 +02:00
parent ad32734537
commit 1fcf8b8a74
27 changed files with 81 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -210,8 +210,8 @@ bool BufferView::getElement(int32_t _colomn, int32_t _raw, std::string& _myTextT
return true;
}
bool BufferView::onItemEvent(int32_t _IdInput, enum ewol::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y) {
if (1 == _IdInput && _typeEvent == ewol::key::statusSingle) {
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) {
APPL_INFO("Event on List : IdInput=" << _IdInput << " colomn=" << _colomn << " raw=" << _raw );
if( _raw >= 0
&& _raw<(int64_t)m_list.size()) {

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

@@ -66,7 +66,7 @@ class BufferView : public ewol::widget::List {
virtual bool getTitle(int32_t _colomn, std::string& _myTitle, etk::Color<>& _fg, etk::Color<>& _bg);
virtual uint32_t getNuberOfRaw();
virtual bool getElement(int32_t _colomn, int32_t _raw, std::string& _myTextToWrite, etk::Color<>& _fg, etk::Color<>& _bg);
virtual bool onItemEvent(int32_t _IdInput, enum ewol::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y);
virtual bool onItemEvent(int32_t _IdInput, enum gale::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y);
private: //callback function:
void onCallbackChangeName();
void onCallbackIsSave();

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

@@ -79,8 +79,8 @@ bool appl::TagFileList::getElement(int32_t _colomn, int32_t _raw, std::string& _
};
bool appl::TagFileList::onItemEvent(int32_t _IdInput, enum ewol::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y) {
if (_typeEvent == ewol::key::statusSingle) {
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) {
EWOL_INFO("Event on List : IdInput=" << _IdInput << " colomn=" << _colomn << " raw=" << _raw );
if (_IdInput == 1) {
int32_t previousRaw = m_selectedLine;

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

@@ -53,7 +53,7 @@ namespace appl {
bool getTitle(int32_t _colomn, std::string& _myTitle, etk::Color<>& _fg, etk::Color<>& _bg);
uint32_t getNuberOfRaw();
bool getElement(int32_t _colomn, int32_t _raw, std::string& _myTextToWrite, etk::Color<>& _fg, etk::Color<>& _bg);
bool onItemEvent(int32_t _IdInput, enum ewol::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y);
bool onItemEvent(int32_t _IdInput, enum gale::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y);
public:
/**
* @brief add a Ctags item on the curent list

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

@@ -44,11 +44,11 @@ void appl::TagFileSelection::init() {
ewol::widget::PopUp::init();
std::shared_ptr<ewol::widget::Sizer> mySizerVert;
#if defined(__TARGET_OS__Android)
setMinSize(ewol::Dimension(vec2(90,90),ewol::Dimension::Pourcent));
setMinSize(gale::Dimension(vec2(90,90), gale::Dimension::Pourcent));
#elif defined(__TARGET_OS__Windows)
setMinSize(ewol::Dimension(vec2(80,80),ewol::Dimension::Pourcent));
setMinSize(gale::Dimension(vec2(80,80), gale::Dimension::Pourcent));
#else
setMinSize(ewol::Dimension(vec2(80,80),ewol::Dimension::Pourcent));
setMinSize(gale::Dimension(vec2(80,80), gale::Dimension::Pourcent));
#endif
mySizerVert = ewol::widget::Sizer::create(ewol::widget::Sizer::modeVert);

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

@@ -10,7 +10,7 @@
#include <appl/global.h>
#include <appl/Gui/TextViewer.h>
#include <appl/BufferManager.h>
#include <ewol/context/clipBoard.h>
#include <gale/context/clipBoard.h>
#include <ewol/widget/Manager.h>
#include <appl/Gui/ViewerManager.h>
@@ -393,9 +393,9 @@ bool appl::TextViewer::onEventEntry(const ewol::event::Entry& _event) {
return true;
}
// just forward event == > manage directly in the buffer
if (_event.getType() == ewol::key::keyboardChar) {
if (_event.getType() == gale::key::keyboard_char) {
//APPL_DEBUG("KB EVENT : \"" << UTF8_data << "\" size=" << strlen(UTF8_data) << "type=" << (int32_t)typeEvent);
if (_event.getStatus() != ewol::key::statusDown) {
if (_event.getStatus() != gale::key::status_down) {
return false;
}
char32_t localValue = _event.getChar();
@@ -445,44 +445,44 @@ bool appl::TextViewer::onEventEntry(const ewol::event::Entry& _event) {
return true;
}
// move events ...
if (_event.getStatus() == ewol::key::statusDown) {
if (_event.getStatus() == gale::key::status_down) {
// selection when shift is set:
m_buffer->setSelectMode(_event.getSpecialKey().getShift());
// check selection event ...
switch(_event.getType()) {
case ewol::key::keyboardInsert:
case gale::key::keyboard_insert:
m_insertMode = m_insertMode==true?false:true;
markToRedraw();
break;
case ewol::key::keyboardLeft:
case gale::key::keyboard_left:
//APPL_INFO("keyEvent : <LEFT>");
moveCursorLeft();
break;
case ewol::key::keyboardRight:
case gale::key::keyboard_right:
//APPL_INFO("keyEvent : <RIGHT>");
moveCursorRight();
break;
case ewol::key::keyboardUp:
case gale::key::keyboard_up:
//APPL_INFO("keyEvent : <UP>");
moveCursorUp(1);
break;
case ewol::key::keyboardDown:
case gale::key::keyboard_down:
//APPL_INFO("keyEvent : <DOWN>");
moveCursorDown(1);
break;
case ewol::key::keyboardPageUp:
case gale::key::keyboard_pageUp:
//APPL_INFO("keyEvent : <PAGE-UP>");
moveCursorUp(15); // TODO : Set the real number of line ...
break;
case ewol::key::keyboardPageDown:
case gale::key::keyboard_pageDown:
//APPL_INFO("keyEvent : <PAGE-DOWN>");
moveCursorDown(15); // TODO : Set the real number of line ...
break;
case ewol::key::keyboardStart:
case gale::key::keyboard_start:
//APPL_INFO("keyEvent : <Start of line>");
moveCursorLeft(moveEnd);
break;
case ewol::key::keyboardEnd:
case gale::key::keyboard_end:
//APPL_INFO("keyEvent : <End of line>");
moveCursorRight(moveEnd);
break;
@@ -496,7 +496,7 @@ bool appl::TextViewer::onEventEntry(const ewol::event::Entry& _event) {
bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) {
if ( _event.getId() != 0
&& _event.getStatus() == ewol::key::statusDown) {
&& _event.getStatus() == gale::key::status_down) {
keepFocus();
}
//tic();
@@ -526,7 +526,7 @@ bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) {
relativePos.setX(0);
}
if ( _event.getId() == 12
&& _event.getStatus() == ewol::key::statusSingle) {
&& _event.getStatus() == gale::key::status_single) {
APPL_TODO("RAT5 SAVE button ==> TODO implement");
// Rat5 save event
//sendMultiCast(ednMsgGuiSave, "current");
@@ -535,8 +535,8 @@ bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) {
// just forward event == > manage directly in the buffer
if (_event.getId() == 1) {
// mouse selection :
//if (_event.getType() == ewol::key::typeMouse) {
if (_event.getStatus() == ewol::key::statusDown) {
//if (_event.getType() == gale::key::typeMouse) {
if (_event.getStatus() == gale::key::status_down) {
//if (_event.getSpecialKey().isSetShift() == false) {
appl::Buffer::Iterator newPos = getMousePosition(relativePos);
m_buffer->setSelectMode(false);
@@ -545,7 +545,7 @@ bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) {
markToRedraw();
return true;
//}
} else if (_event.getStatus() == ewol::key::statusUp) {
} else if (_event.getStatus() == gale::key::status_up) {
appl::Buffer::Iterator newPos = getMousePosition(relativePos);
moveCursor(newPos);
m_buffer->setSelectMode(false);
@@ -553,41 +553,41 @@ bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) {
std::string value;
m_buffer->copy(value);
if (value.size() != 0) {
ewol::context::clipBoard::set(ewol::context::clipBoard::clipboardSelection, value);
gale::context::clipBoard::set(gale::context::clipBoard::clipboardSelection, value);
}
markToRedraw();
return true;
}
//}
if (_event.getStatus() == ewol::key::statusSingle) {
if ( _event.getType() == ewol::key::typeMouse
|| _event.getType() == ewol::key::typeFinger) {
if (_event.getStatus() == gale::key::status_single) {
if ( _event.getType() == gale::key::type_mouse
|| _event.getType() == gale::key::type_finger) {
appl::Buffer::Iterator newPos = getMousePosition(relativePos);
moveCursor(newPos);
markToRedraw();
return true;
}
} else if (_event.getStatus() == ewol::key::statusDouble) {
} else if (_event.getStatus() == gale::key::status_double) {
mouseEventDouble();
// Copy selection :
std::string value;
m_buffer->copy(value);
if (value.size() != 0) {
ewol::context::clipBoard::set(ewol::context::clipBoard::clipboardSelection, value);
gale::context::clipBoard::set(gale::context::clipBoard::clipboardSelection, value);
}
markToRedraw();
return true;
} else if (_event.getStatus() == ewol::key::statusTriple) {
} else if (_event.getStatus() == gale::key::status_triple) {
mouseEventTriple();
// Copy selection :
std::string value;
m_buffer->copy(value);
if (value.size() != 0) {
ewol::context::clipBoard::set(ewol::context::clipBoard::clipboardSelection, value);
gale::context::clipBoard::set(gale::context::clipBoard::clipboardSelection, value);
}
markToRedraw();
return true;
} else if (_event.getStatus() == ewol::key::statusMove) {
} else if (_event.getStatus() == gale::key::status_move) {
if (m_buffer->getSelectMode() == true) {
//int64_t timeStart = ewol::getTime();
appl::Buffer::Iterator newPos = getMousePosition(relativePos);
@@ -605,10 +605,10 @@ bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) {
}
}
} else if (2 == _event.getId()) {
if (ewol::key::statusSingle == _event.getStatus()) {
if (gale::key::status_single == _event.getStatus()) {
appl::Buffer::Iterator newPos = getMousePosition(relativePos);
moveCursor(newPos);
ewol::context::clipBoard::request(ewol::context::clipBoard::clipboardSelection);
gale::context::clipBoard::request(gale::context::clipBoard::clipboardSelection);
markToRedraw();
return true;
}
@@ -683,9 +683,9 @@ appl::Buffer::Iterator appl::TextViewer::getMousePosition(const vec2& _relativeP
return m_buffer->end();
}
void appl::TextViewer::onEventClipboard(enum ewol::context::clipBoard::clipboardListe _clipboardID) {
void appl::TextViewer::onEventClipboard(enum gale::context::clipBoard::clipboardListe _clipboardID) {
if (m_buffer != nullptr) {
std::string data = ewol::context::clipBoard::get(_clipboardID);
std::string data = gale::context::clipBoard::get(_clipboardID);
write(data);
}
markToRedraw();

2
sources/appl/Gui/TextViewer.h
View File

@@ -67,7 +67,7 @@ namespace appl {
virtual void onRegenerateDisplay();
virtual bool onEventInput(const ewol::event::Input& _event);
virtual bool onEventEntry(const ewol::event::Entry& _event);
virtual void onEventClipboard(enum ewol::context::clipBoard::clipboardListe _clipboardID);
virtual void onEventClipboard(enum gale::context::clipBoard::clipboardListe _clipboardID);
virtual void onGetFocus();
virtual void onLostFocus();
virtual void changeZoom(float _range);

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

@@ -12,7 +12,7 @@
#include <appl/Gui/TextViewer.h>
#include <ewol/object/Object.h>
#include <ewol/object/Manager.h>
#include <ewol/resource/Manager.h>
#include <gale/resource/Manager.h>
#undef __class__
#define __class__ "ViewerManager"
@@ -24,7 +24,7 @@ appl::ViewerManager::ViewerManager() {
}
void appl::ViewerManager::init(const std::string& _uniqueName) {
ewol::Resource::init(_uniqueName);
ewol::Object::init(_uniqueName);
}
appl::ViewerManager::~ViewerManager() {

6
sources/appl/Gui/ViewerManager.h
View File

@@ -12,17 +12,17 @@
#include <appl/Buffer.h>
#include <appl/globalMsg.h>
#include <ewol/widget/Widget.h>
#include <ewol/resource/Resource.h>
#include <gale/resource/Resource.h>
#include <appl/BufferManager.h>
namespace appl {
class TextViewer;
class ViewerManager : public ewol::Resource {
class ViewerManager : public ewol::Object {
protected:
ViewerManager();
void init(const std::string& _uniqueName);
public:
DECLARE_RESOURCE_SINGLE_FACTORY(ViewerManager, "???ViewerManager???");
DECLARE_SINGLE_FACTORY(ViewerManager, "???ViewerManager???");
virtual ~ViewerManager();
private:
std::shared_ptr<appl::BufferManager> m_bufferManager; //!< handle on the buffer manager