[STYLE] remove (void) in () to be c++ coherent
This commit is contained in:
@@ -39,7 +39,7 @@ static void SortElementList(std::vector<appl::dataBufferStruct*>& _list) {
|
||||
}
|
||||
}
|
||||
|
||||
BufferView::BufferView(void) :
|
||||
BufferView::BufferView() :
|
||||
m_openOrderMode(false) {
|
||||
addObjectType("appl::BufferView");
|
||||
setCanHaveFocus(true);
|
||||
@@ -63,11 +63,11 @@ BufferView::BufferView(void) :
|
||||
m_colorTextModify = m_paintingProperties->request("textModify");
|
||||
}
|
||||
|
||||
BufferView::~BufferView(void) {
|
||||
BufferView::~BufferView() {
|
||||
removeAllElement();
|
||||
}
|
||||
|
||||
void BufferView::removeAllElement(void) {
|
||||
void BufferView::removeAllElement() {
|
||||
for(int32_t iii=0; iii<m_list.size(); iii++) {
|
||||
if (NULL!=m_list[iii]) {
|
||||
delete(m_list[iii]);
|
||||
@@ -237,11 +237,11 @@ void BufferView::onObjectRemove(ewol::Object* _removeObject) {
|
||||
}
|
||||
|
||||
|
||||
etk::Color<> BufferView::getBasicBG(void) {
|
||||
etk::Color<> BufferView::getBasicBG() {
|
||||
return (*m_paintingProperties)[m_colorBackground1].getForeground();
|
||||
}
|
||||
|
||||
uint32_t BufferView::getNuberOfColomn(void) {
|
||||
uint32_t BufferView::getNuberOfColomn() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -250,7 +250,7 @@ bool BufferView::getTitle(int32_t _colomn, std::string &_myTitle, etk::Color<> &
|
||||
return true;
|
||||
}
|
||||
|
||||
uint32_t BufferView::getNuberOfRaw(void) {
|
||||
uint32_t BufferView::getNuberOfRaw() {
|
||||
return m_list.size();
|
||||
}
|
||||
|
||||
|
@@ -27,7 +27,7 @@ namespace appl
|
||||
m_buffer(_buffer) {
|
||||
|
||||
};
|
||||
~dataBufferStruct(void) { };
|
||||
~dataBufferStruct() { };
|
||||
};
|
||||
};
|
||||
|
||||
@@ -53,8 +53,8 @@ class BufferView : public ewol::widget::List
|
||||
void insertAlphabetic(appl::dataBufferStruct* _dataStruct, bool _selectNewPosition = false);
|
||||
public:
|
||||
// Constructeur
|
||||
BufferView(void);
|
||||
~BufferView(void);
|
||||
BufferView();
|
||||
~BufferView();
|
||||
// Derived function
|
||||
virtual void onReceiveMessage(const ewol::object::Message& _msg);
|
||||
virtual void onObjectRemove(ewol::Object* _removeObject);
|
||||
@@ -62,12 +62,12 @@ class BufferView : public ewol::widget::List
|
||||
bool m_openOrderMode; //!< true if the order is the opening order mode, otherwise, Alphabetic order
|
||||
protected:
|
||||
// function call to display the list :
|
||||
virtual etk::Color<> getBasicBG(void);
|
||||
void removeAllElement(void);
|
||||
virtual etk::Color<> getBasicBG();
|
||||
void removeAllElement();
|
||||
// Derived function
|
||||
virtual uint32_t getNuberOfColomn(void);
|
||||
virtual uint32_t getNuberOfColomn();
|
||||
virtual bool getTitle(int32_t _colomn, std::string& _myTitle, etk::Color<>& _fg, etk::Color<>& _bg);
|
||||
virtual uint32_t getNuberOfRaw(void);
|
||||
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);
|
||||
};
|
||||
|
@@ -38,7 +38,7 @@
|
||||
#include <appl/Gui/WorkerCloseAllFile.h>
|
||||
|
||||
namespace appl {
|
||||
std::string getVersion(void) {
|
||||
std::string getVersion() {
|
||||
#define FIRST_YEAR (2010)
|
||||
std::string tmpOutput = std::to_string(date::getYear()-FIRST_YEAR);
|
||||
tmpOutput += ".";
|
||||
@@ -59,7 +59,7 @@ namespace appl {
|
||||
|
||||
class ParameterAboutGui : public ewol::widget::Sizer {
|
||||
public :
|
||||
ParameterAboutGui(void) :
|
||||
ParameterAboutGui() :
|
||||
ewol::widget::Sizer(ewol::widget::Sizer::modeVert) {
|
||||
ewol::widget::Spacer* mySpacer = NULL;
|
||||
|
||||
@@ -102,7 +102,7 @@ class ParameterAboutGui : public ewol::widget::Sizer {
|
||||
}
|
||||
};
|
||||
|
||||
~ParameterAboutGui(void) {
|
||||
~ParameterAboutGui() {
|
||||
|
||||
};
|
||||
};
|
||||
@@ -119,7 +119,7 @@ const char* l_smoothMax = "tmpEvent_maxChange";
|
||||
#undef __class__
|
||||
#define __class__ "MainWindows"
|
||||
|
||||
MainWindows::MainWindows(void) {
|
||||
MainWindows::MainWindows() {
|
||||
addObjectType("appl::MainWindows");
|
||||
APPL_DEBUG("CREATE WINDOWS ... ");
|
||||
ewol::widget::Sizer * mySizerVert = NULL;
|
||||
@@ -172,51 +172,51 @@ MainWindows::MainWindows(void) {
|
||||
myMenu = new ewol::widget::Menu();
|
||||
mySizerHori->subWidgetAdd(myMenu);
|
||||
int32_t idMenuFile = myMenu->addTitle("File");
|
||||
(void)myMenu->add(idMenuFile, "New", "", ednMsgGuiNew);
|
||||
(void)myMenu->addSpacer();
|
||||
(void)myMenu->add(idMenuFile, "Open", "THEME:GUI:Load.edf", ednMsgGuiOpen);
|
||||
(void)myMenu->add(idMenuFile, "Close", "THEME:GUI:Close.edf", ednMsgGuiClose, "current");
|
||||
(void)myMenu->add(idMenuFile, "Close (all)", "", ednMsgGuiClose, "All");
|
||||
(void)myMenu->add(idMenuFile, "Save", "THEME:GUI:Save.edf", ednMsgGuiSave, "current");
|
||||
(void)myMenu->add(idMenuFile, "Save As ...", "", ednMsgGuiSaveAs);
|
||||
(void)myMenu->addSpacer();
|
||||
//(void)myMenu->add(idMenuFile, "Exit", "", ednMsgGuiExit);
|
||||
(void)myMenu->addSpacer();
|
||||
(void)myMenu->add(idMenuFile, "Properties", "THEME:GUI:Parameter.edf", ednMsgProperties);
|
||||
myMenu->add(idMenuFile, "New", "", ednMsgGuiNew);
|
||||
myMenu->addSpacer();
|
||||
myMenu->add(idMenuFile, "Open", "THEME:GUI:Load.edf", ednMsgGuiOpen);
|
||||
myMenu->add(idMenuFile, "Close", "THEME:GUI:Close.edf", ednMsgGuiClose, "current");
|
||||
myMenu->add(idMenuFile, "Close (all)", "", ednMsgGuiClose, "All");
|
||||
myMenu->add(idMenuFile, "Save", "THEME:GUI:Save.edf", ednMsgGuiSave, "current");
|
||||
myMenu->add(idMenuFile, "Save As ...", "", ednMsgGuiSaveAs);
|
||||
myMenu->addSpacer();
|
||||
//myMenu->add(idMenuFile, "Exit", "", ednMsgGuiExit);
|
||||
myMenu->addSpacer();
|
||||
myMenu->add(idMenuFile, "Properties", "THEME:GUI:Parameter.edf", ednMsgProperties);
|
||||
int32_t idMenuEdit = myMenu->addTitle("Edit");
|
||||
(void)myMenu->add(idMenuEdit, "Undo", "THEME:GUI:Undo.edf", ednMsgGuiUndo);
|
||||
(void)myMenu->add(idMenuEdit, "Redo", "THEME:GUI:Redo.edf", ednMsgGuiRedo);
|
||||
(void)myMenu->addSpacer();
|
||||
(void)myMenu->add(idMenuEdit, "Copy", "", ednMsgGuiCopy, "STD");
|
||||
(void)myMenu->add(idMenuEdit, "Cut", "", ednMsgGuiCut, "STD");
|
||||
(void)myMenu->add(idMenuEdit, "Paste", "", ednMsgGuiPaste, "STD");
|
||||
(void)myMenu->add(idMenuEdit, "Remove", "", ednMsgGuiRm);
|
||||
(void)myMenu->addSpacer();
|
||||
(void)myMenu->add(idMenuEdit, "Select All","", ednMsgGuiSelect, "ALL");
|
||||
(void)myMenu->add(idMenuEdit, "Un-Select","", ednMsgGuiSelect, "NONE");
|
||||
(void)myMenu->add(idMenuEdit, "Goto line ...","", ednMsgGuiGotoLine, "???");
|
||||
myMenu->add(idMenuEdit, "Undo", "THEME:GUI:Undo.edf", ednMsgGuiUndo);
|
||||
myMenu->add(idMenuEdit, "Redo", "THEME:GUI:Redo.edf", ednMsgGuiRedo);
|
||||
myMenu->addSpacer();
|
||||
myMenu->add(idMenuEdit, "Copy", "", ednMsgGuiCopy, "STD");
|
||||
myMenu->add(idMenuEdit, "Cut", "", ednMsgGuiCut, "STD");
|
||||
myMenu->add(idMenuEdit, "Paste", "", ednMsgGuiPaste, "STD");
|
||||
myMenu->add(idMenuEdit, "Remove", "", ednMsgGuiRm);
|
||||
myMenu->addSpacer();
|
||||
myMenu->add(idMenuEdit, "Select All","", ednMsgGuiSelect, "ALL");
|
||||
myMenu->add(idMenuEdit, "Un-Select","", ednMsgGuiSelect, "NONE");
|
||||
myMenu->add(idMenuEdit, "Goto line ...","", ednMsgGuiGotoLine, "???");
|
||||
int32_t idMenuSearch = myMenu->addTitle("Search");
|
||||
(void)myMenu->add(idMenuSearch, "Search", "THEME:GUI:Search.edf", ednMsgGuiSearch);
|
||||
(void)myMenu->add(idMenuSearch, "Replace", "THEME:GUI:Replace.edf", ednMsgGuiReplace);
|
||||
(void)myMenu->addSpacer();
|
||||
(void)myMenu->add(idMenuSearch, "Find (previous)","", ednMsgGuiFind, "Previous");
|
||||
(void)myMenu->add(idMenuSearch, "Find (next)", "", ednMsgGuiFind, "Next");
|
||||
(void)myMenu->add(idMenuSearch, "Find (all)", "", ednMsgGuiFind, "All");
|
||||
(void)myMenu->add(idMenuSearch, "Un-Select", "", ednMsgGuiFind, "None");
|
||||
myMenu->add(idMenuSearch, "Search", "THEME:GUI:Search.edf", ednMsgGuiSearch);
|
||||
myMenu->add(idMenuSearch, "Replace", "THEME:GUI:Replace.edf", ednMsgGuiReplace);
|
||||
myMenu->addSpacer();
|
||||
myMenu->add(idMenuSearch, "Find (previous)","", ednMsgGuiFind, "Previous");
|
||||
myMenu->add(idMenuSearch, "Find (next)", "", ednMsgGuiFind, "Next");
|
||||
myMenu->add(idMenuSearch, "Find (all)", "", ednMsgGuiFind, "All");
|
||||
myMenu->add(idMenuSearch, "Un-Select", "", ednMsgGuiFind, "None");
|
||||
/* ==> must be in the pluggin list control ...
|
||||
int32_t idMenuCTags = myMenu->addTitle("C-tags");
|
||||
(void)myMenu->add(idMenuCTags, "Load", "", ednMsgGuiCtags, "Load");
|
||||
(void)myMenu->add(idMenuCTags, "ReLoad", "", ednMsgGuiCtags, "ReLoad");
|
||||
(void)myMenu->add(idMenuCTags, "Jump", "", ednMsgGuiCtags, "Jump");
|
||||
(void)myMenu->add(idMenuCTags, "Back", "", ednMsgGuiCtags, "Back");
|
||||
myMenu->add(idMenuCTags, "Load", "", ednMsgGuiCtags, "Load");
|
||||
myMenu->add(idMenuCTags, "ReLoad", "", ednMsgGuiCtags, "ReLoad");
|
||||
myMenu->add(idMenuCTags, "Jump", "", ednMsgGuiCtags, "Jump");
|
||||
myMenu->add(idMenuCTags, "Back", "", ednMsgGuiCtags, "Back");
|
||||
*/
|
||||
int32_t idMenugDisplay = myMenu->addTitle("Display");
|
||||
(void)myMenu->add(idMenugDisplay, "Color Black", "", appl::MsgNameGuiChangeColor, "color/black/");
|
||||
(void)myMenu->add(idMenugDisplay, "Color White", "", appl::MsgNameGuiChangeColor, "color/white/");
|
||||
(void)myMenu->add(idMenugDisplay, "Shape square", "", l_MsgNameGuiChangeShape, "shape/square/");
|
||||
(void)myMenu->add(idMenugDisplay, "Shape round", "", l_MsgNameGuiChangeShape, "shape/round/");
|
||||
(void)myMenu->addSpacer();
|
||||
(void)myMenu->add(idMenugDisplay, "Reload openGl Shader", "", ednMsgGuiReloadShader);
|
||||
myMenu->add(idMenugDisplay, "Color Black", "", appl::MsgNameGuiChangeColor, "color/black/");
|
||||
myMenu->add(idMenugDisplay, "Color White", "", appl::MsgNameGuiChangeColor, "color/white/");
|
||||
myMenu->add(idMenugDisplay, "Shape square", "", l_MsgNameGuiChangeShape, "shape/square/");
|
||||
myMenu->add(idMenugDisplay, "Shape round", "", l_MsgNameGuiChangeShape, "shape/round/");
|
||||
myMenu->addSpacer();
|
||||
myMenu->add(idMenugDisplay, "Reload openGl Shader", "", ednMsgGuiReloadShader);
|
||||
|
||||
m_widgetLabelFileName = new ewol::widget::Label("FileName");
|
||||
m_widgetLabelFileName->setExpand(bvec2(true,false));
|
||||
@@ -264,7 +264,7 @@ MainWindows::MainWindows(void) {
|
||||
}
|
||||
|
||||
|
||||
MainWindows::~MainWindows(void) {
|
||||
MainWindows::~MainWindows() {
|
||||
appl::BufferManager::release(m_bufferManager);
|
||||
}
|
||||
|
||||
@@ -393,7 +393,7 @@ void MainWindows::onReceiveMessage(const ewol::object::Message& _msg) {
|
||||
|
||||
|
||||
} else if (_msg.getMessage() == ednMsgGuiNew) {
|
||||
(void)m_bufferManager->createNewBuffer();
|
||||
m_bufferManager->createNewBuffer();
|
||||
} else if (_msg.getMessage() == ednEventPopUpFileSelected) {
|
||||
APPL_DEBUG("Request opening the file : " << _msg.getData());
|
||||
m_bufferManager->open(_msg.getData());
|
||||
|
@@ -22,8 +22,8 @@ class MainWindows : public ewol::widget::Windows {
|
||||
ewol::widget::Label* m_widgetLabelFileName;
|
||||
public:
|
||||
// Constructeur
|
||||
MainWindows(void);
|
||||
~MainWindows(void);
|
||||
MainWindows();
|
||||
~MainWindows();
|
||||
private:
|
||||
appl::BufferManager* m_bufferManager; //!< handle on the buffer manager
|
||||
/**
|
||||
|
@@ -28,7 +28,7 @@ const char* const l_eventWrapCb = "appl-wrap-CheckBox";
|
||||
const char* const l_eventForwardCb = "appl-forward-CheckBox";
|
||||
const char* const l_eventHideBt = "appl-hide-button";
|
||||
|
||||
Search::Search(void) :
|
||||
Search::Search() :
|
||||
ewol::widget::Composer(ewol::widget::Composer::file, "DATA:GUI-Search.xml"),
|
||||
m_viewerManager(NULL),
|
||||
m_forward(true),
|
||||
@@ -63,11 +63,11 @@ Search::Search(void) :
|
||||
hide();
|
||||
}
|
||||
|
||||
Search::~Search(void) {
|
||||
Search::~Search() {
|
||||
appl::ViewerManager::release(m_viewerManager);
|
||||
}
|
||||
|
||||
void Search::find(void) {
|
||||
void Search::find() {
|
||||
if (m_viewerManager == NULL) {
|
||||
APPL_WARNING("No viewer manager selected!!!");
|
||||
return;
|
||||
@@ -103,7 +103,7 @@ void Search::find(void) {
|
||||
}
|
||||
}
|
||||
|
||||
void Search::replace(void) {
|
||||
void Search::replace() {
|
||||
if (m_viewerManager == NULL) {
|
||||
APPL_WARNING("No viewer manager selected!!!");
|
||||
return;
|
||||
|
@@ -27,17 +27,17 @@ class Search : public ewol::widget::Composer {
|
||||
std::u32string m_replaceData;
|
||||
public:
|
||||
// Constructeur
|
||||
Search(void);
|
||||
~Search(void);
|
||||
Search();
|
||||
~Search();
|
||||
private:
|
||||
/**
|
||||
* @brief Find the next element that corespond at the search
|
||||
*/
|
||||
void find(void);
|
||||
void find();
|
||||
/**
|
||||
* @brief Replace the current selected text.
|
||||
*/
|
||||
void replace(void);
|
||||
void replace();
|
||||
public: // derived function
|
||||
virtual void onReceiveMessage(const ewol::object::Message& _msg);
|
||||
virtual void onObjectRemove(ewol::Object * _removeObject);
|
||||
|
@@ -16,7 +16,7 @@ extern const char * const applEventCtagsListSelect = "appl-event-ctags-list-
|
||||
extern const char * const applEventCtagsListUnSelect = "appl-event-ctags-list-un-select";
|
||||
extern const char * const applEventCtagsListValidate = "appl-event-ctags-list-validate";
|
||||
|
||||
appl::TagFileList::TagFileList(void) {
|
||||
appl::TagFileList::TagFileList() {
|
||||
addObjectType("appl::TagFileList");
|
||||
m_selectedLine = -1;
|
||||
addEventId(applEventCtagsListSelect);
|
||||
@@ -33,7 +33,7 @@ appl::TagFileList::TagFileList(void) {
|
||||
}
|
||||
|
||||
|
||||
appl::TagFileList::~TagFileList(void) {
|
||||
appl::TagFileList::~TagFileList() {
|
||||
for (int32_t iii=0; iii<m_list.size(); iii++) {
|
||||
delete(m_list[iii]);
|
||||
m_list[iii] = NULL;
|
||||
@@ -41,11 +41,11 @@ appl::TagFileList::~TagFileList(void) {
|
||||
ewol::resource::ColorFile::release(m_colorProperty);
|
||||
}
|
||||
|
||||
etk::Color<> appl::TagFileList::getBasicBG(void) {
|
||||
etk::Color<> appl::TagFileList::getBasicBG() {
|
||||
return 0x00000010;
|
||||
}
|
||||
|
||||
uint32_t appl::TagFileList::getNuberOfColomn(void) {
|
||||
uint32_t appl::TagFileList::getNuberOfColomn() {
|
||||
return 2;
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ bool appl::TagFileList::getTitle(int32_t _colomn, std::string& _myTitle, etk::Co
|
||||
return true;
|
||||
}
|
||||
|
||||
uint32_t appl::TagFileList::getNuberOfRaw(void) {
|
||||
uint32_t appl::TagFileList::getNuberOfRaw() {
|
||||
return m_list.size();
|
||||
}
|
||||
|
||||
|
@@ -28,7 +28,7 @@ namespace appl {
|
||||
fileLine(_line) {
|
||||
|
||||
};
|
||||
~TagListElement(void) {
|
||||
~TagListElement() {
|
||||
|
||||
};
|
||||
};
|
||||
@@ -43,13 +43,13 @@ namespace appl {
|
||||
int32_t m_colorIdBackground2; //!< Color of the Background 2.
|
||||
int32_t m_colorIdBackgroundSelected; //!< Color of line selected.
|
||||
public:
|
||||
TagFileList(void);
|
||||
~TagFileList(void);
|
||||
TagFileList();
|
||||
~TagFileList();
|
||||
// display API :
|
||||
virtual etk::Color<> getBasicBG(void);
|
||||
uint32_t getNuberOfColomn(void);
|
||||
virtual etk::Color<> getBasicBG();
|
||||
uint32_t getNuberOfColomn();
|
||||
bool getTitle(int32_t _colomn, std::string& _myTitle, etk::Color<>& _fg, etk::Color<>& _bg);
|
||||
uint32_t getNuberOfRaw(void);
|
||||
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);
|
||||
public:
|
||||
|
@@ -30,7 +30,7 @@ extern const char * const applEventctagsSelection = "appl-event-ctags-validate";
|
||||
extern const char * const applEventctagsCancel = "appl-event-ctags-cancel";
|
||||
|
||||
|
||||
appl::TagFileSelection::TagFileSelection(void) {
|
||||
appl::TagFileSelection::TagFileSelection() {
|
||||
addObjectType("appl::TagFileSelection");
|
||||
addEventId(applEventctagsSelection);
|
||||
addEventId(applEventctagsCancel);
|
||||
@@ -98,7 +98,7 @@ appl::TagFileSelection::TagFileSelection(void) {
|
||||
}
|
||||
|
||||
|
||||
appl::TagFileSelection::~TagFileSelection(void) {
|
||||
appl::TagFileSelection::~TagFileSelection() {
|
||||
|
||||
}
|
||||
|
||||
|
@@ -22,8 +22,8 @@ namespace appl {
|
||||
appl::TagFileList* m_listTag;
|
||||
std::string m_eventNamed;
|
||||
public:
|
||||
TagFileSelection(void);
|
||||
virtual ~TagFileSelection(void);
|
||||
TagFileSelection();
|
||||
virtual ~TagFileSelection();
|
||||
/**
|
||||
* @brief add a Ctags item on the curent list
|
||||
* @param[in] file Compleate file name
|
||||
|
@@ -63,14 +63,14 @@ appl::TextViewer::TextViewer(const std::string& _fontName, int32_t _fontSize) :
|
||||
setCurrentSelect();
|
||||
}
|
||||
|
||||
appl::TextViewer::~TextViewer(void) {
|
||||
appl::TextViewer::~TextViewer() {
|
||||
appl::textPluginManager::disconnect(*this);
|
||||
appl::GlyphPainting::release(m_paintingProperties);
|
||||
appl::BufferManager::release(m_bufferManager);
|
||||
appl::ViewerManager::release(m_viewerManager);
|
||||
}
|
||||
|
||||
std::string appl::TextViewer::getBufferPath(void) {
|
||||
std::string appl::TextViewer::getBufferPath() {
|
||||
if (m_buffer == NULL) {
|
||||
return "";
|
||||
}
|
||||
@@ -87,19 +87,19 @@ void appl::TextViewer::changeZoom(float _range) {
|
||||
markToRedraw();
|
||||
}
|
||||
|
||||
bool appl::TextViewer::calculateMinSize(void) {
|
||||
bool appl::TextViewer::calculateMinSize() {
|
||||
m_minSize.setValue(50,50);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
void appl::TextViewer::onDraw(void) {
|
||||
void appl::TextViewer::onDraw() {
|
||||
m_displayDrawing.draw();
|
||||
m_displayText.draw();
|
||||
WidgetScrolled::onDraw();
|
||||
}
|
||||
|
||||
void appl::TextViewer::onRegenerateDisplay(void) {
|
||||
void appl::TextViewer::onRegenerateDisplay() {
|
||||
if (false == needRedraw()) {
|
||||
return;
|
||||
}
|
||||
@@ -549,7 +549,7 @@ bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) {
|
||||
}
|
||||
|
||||
|
||||
void appl::TextViewer::mouseEventDouble(void) {
|
||||
void appl::TextViewer::mouseEventDouble() {
|
||||
//m_selectMode = false;
|
||||
appl::Buffer::Iterator beginPos, endPos;
|
||||
if (true == m_buffer->getPosAround(m_buffer->cursor(), beginPos, endPos)) {
|
||||
@@ -558,7 +558,7 @@ void appl::TextViewer::mouseEventDouble(void) {
|
||||
}
|
||||
}
|
||||
|
||||
void appl::TextViewer::mouseEventTriple(void) {
|
||||
void appl::TextViewer::mouseEventTriple() {
|
||||
//m_selectMode = false;
|
||||
moveCursor(m_buffer->getEndLine(m_buffer->cursor()));
|
||||
m_buffer->setSelectionPos(m_buffer->getStartLine(m_buffer->cursor()));
|
||||
@@ -710,14 +710,14 @@ void appl::TextViewer::onObjectRemove(ewol::Object* _removeObject) {
|
||||
}
|
||||
}
|
||||
|
||||
void appl::TextViewer::onGetFocus(void) {
|
||||
void appl::TextViewer::onGetFocus() {
|
||||
showKeyboard();
|
||||
APPL_INFO("Focus - In");
|
||||
setCurrentSelect();
|
||||
markToRedraw();
|
||||
}
|
||||
|
||||
void appl::TextViewer::onLostFocus(void) {
|
||||
void appl::TextViewer::onLostFocus() {
|
||||
hideKeyboard();
|
||||
APPL_INFO("Focus - out");
|
||||
markToRedraw();
|
||||
@@ -733,7 +733,7 @@ void appl::TextViewer::setFontName(const std::string& _fontName) {
|
||||
}
|
||||
|
||||
// TODO : Update process time ==> a little expensive (2->4ms) in end of file
|
||||
void appl::TextViewer::updateScrolling(void) {
|
||||
void appl::TextViewer::updateScrolling() {
|
||||
if (m_buffer == NULL) {
|
||||
return;
|
||||
}
|
||||
@@ -828,7 +828,7 @@ bool appl::TextViewer::replace(const std::string& _data) {
|
||||
return replace(_data, m_buffer->selectStart(), m_buffer->selectStop());
|
||||
}
|
||||
|
||||
void appl::TextViewer::remove(void) {
|
||||
void appl::TextViewer::remove() {
|
||||
if (m_buffer == NULL) {
|
||||
return;
|
||||
}
|
||||
@@ -998,13 +998,13 @@ float appl::TextViewer::getScreenSize(const appl::Buffer::Iterator& _startLinePo
|
||||
return ret;
|
||||
}
|
||||
|
||||
void appl::TextViewer::setCurrentSelect(void) {
|
||||
void appl::TextViewer::setCurrentSelect() {
|
||||
if (m_viewerManager != NULL) {
|
||||
m_viewerManager->setViewerSelected(this, m_buffer);
|
||||
}
|
||||
}
|
||||
|
||||
bool appl::TextViewer::isSelectedLast(void) {
|
||||
bool appl::TextViewer::isSelectedLast() {
|
||||
if (m_viewerManager != NULL) {
|
||||
return m_viewerManager->isLastSelected(this);
|
||||
}
|
||||
|
@@ -37,7 +37,7 @@ namespace appl {
|
||||
appl::ViewerManager* m_viewerManager; //!< handle on the buffer manager
|
||||
public:
|
||||
TextViewer(const std::string& _fontName="", int32_t _fontSize=-1);
|
||||
virtual ~TextViewer(void);
|
||||
virtual ~TextViewer();
|
||||
private:
|
||||
appl::Buffer* m_buffer; //!< pointer on the current buffer to display (can be null if the buffer is remover or in state of changing buffer)
|
||||
public:
|
||||
@@ -45,7 +45,7 @@ namespace appl {
|
||||
* @brief Get the buffer property (only for the class : template <typename TYPE> class TextViewerPluginData)
|
||||
* @return pointer on buffer
|
||||
*/
|
||||
appl::Buffer* internalGetBuffer(void) {
|
||||
appl::Buffer* internalGetBuffer() {
|
||||
return m_buffer;
|
||||
}
|
||||
private:
|
||||
@@ -56,17 +56,17 @@ namespace appl {
|
||||
void setFontSize(int32_t _size);
|
||||
void setFontName(const std::string& _fontName);
|
||||
protected: // derived function
|
||||
virtual void onDraw(void);
|
||||
virtual void onDraw();
|
||||
public: // Derived function
|
||||
virtual bool calculateMinSize(void);
|
||||
virtual void onRegenerateDisplay(void);
|
||||
virtual bool calculateMinSize();
|
||||
virtual void onRegenerateDisplay();
|
||||
virtual void onReceiveMessage(const ewol::object::Message& _msg);
|
||||
virtual void onObjectRemove(ewol::Object* _removeObject);
|
||||
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 onGetFocus(void);
|
||||
virtual void onLostFocus(void);
|
||||
virtual void onGetFocus();
|
||||
virtual void onLostFocus();
|
||||
virtual void changeZoom(float _range);
|
||||
private:
|
||||
float m_lastOffsetDisplay; //!< Line number ofssed in the display
|
||||
@@ -77,7 +77,7 @@ namespace appl {
|
||||
* @brief Update the scrolling position from the cursor position,
|
||||
* it might be be all time in the display screen.
|
||||
*/
|
||||
void updateScrolling(void);
|
||||
void updateScrolling();
|
||||
// TODO : Doc : write data on buffer
|
||||
bool moveCursor(const appl::Buffer::Iterator& _pos);
|
||||
bool write(const std::string& _data);
|
||||
@@ -90,11 +90,11 @@ namespace appl {
|
||||
/**
|
||||
* @brief Remove selected data ...
|
||||
*/
|
||||
void remove(void);
|
||||
void remove();
|
||||
/**
|
||||
* @brief Remove selected data ... (No plugin call)
|
||||
*/
|
||||
void removeDirect(void) {
|
||||
void removeDirect() {
|
||||
if (m_buffer==NULL) {
|
||||
return;
|
||||
}
|
||||
@@ -156,8 +156,8 @@ namespace appl {
|
||||
}
|
||||
|
||||
appl::Buffer::Iterator getMousePosition(const vec2& _relativePos);
|
||||
void mouseEventDouble(void);
|
||||
void mouseEventTriple(void);
|
||||
void mouseEventDouble();
|
||||
void mouseEventTriple();
|
||||
private:
|
||||
enum moveMode {
|
||||
moveLetter,
|
||||
@@ -191,30 +191,30 @@ namespace appl {
|
||||
/**
|
||||
* @brief Set the current buffer selected
|
||||
*/
|
||||
void setCurrentSelect(void);
|
||||
void setCurrentSelect();
|
||||
/**
|
||||
* @brief Check if the current buffer is last selected
|
||||
* @return true if selected last
|
||||
*/
|
||||
bool isSelectedLast(void);
|
||||
bool isSelectedLast();
|
||||
public:
|
||||
/**
|
||||
* @brief get the path of the current buffer
|
||||
* @return Path of the buffer (remove the ended name)
|
||||
*/
|
||||
virtual std::string getBufferPath(void);
|
||||
virtual std::string getBufferPath();
|
||||
/**
|
||||
* @brief Check if the buffer is availlable
|
||||
* @return true if a display buffer is present, false otherwise.
|
||||
*/
|
||||
virtual bool hasBuffer(void) {
|
||||
virtual bool hasBuffer() {
|
||||
return m_buffer != NULL;
|
||||
}
|
||||
/**
|
||||
* @brief Get the status of selection.
|
||||
* @return true if we have a current selection, false otherwise.
|
||||
*/
|
||||
virtual bool hasTextSelected(void) {
|
||||
virtual bool hasTextSelected() {
|
||||
if (m_buffer==NULL) {
|
||||
return false;
|
||||
}
|
||||
@@ -223,7 +223,7 @@ namespace appl {
|
||||
/**
|
||||
* @brief Remove Selection of the buffer.
|
||||
*/
|
||||
virtual void unSelect(void) {
|
||||
virtual void unSelect() {
|
||||
if (m_buffer==NULL) {
|
||||
return;
|
||||
}
|
||||
@@ -317,7 +317,7 @@ namespace appl {
|
||||
* @brief Get the cursor position.
|
||||
* @return The iterator on the cursor position
|
||||
*/
|
||||
appl::Buffer::Iterator cursor(void) {
|
||||
appl::Buffer::Iterator cursor() {
|
||||
if (m_buffer==NULL) {
|
||||
return appl::Buffer::Iterator();
|
||||
}
|
||||
@@ -327,7 +327,7 @@ namespace appl {
|
||||
* @brief Get the begin position.
|
||||
* @return The iterator on the begin position
|
||||
*/
|
||||
appl::Buffer::Iterator begin(void) {
|
||||
appl::Buffer::Iterator begin() {
|
||||
if (m_buffer==NULL) {
|
||||
return appl::Buffer::Iterator();
|
||||
}
|
||||
@@ -337,7 +337,7 @@ namespace appl {
|
||||
* @brief Get the end position.
|
||||
* @return The iterator on the end position
|
||||
*/
|
||||
appl::Buffer::Iterator end(void) {
|
||||
appl::Buffer::Iterator end() {
|
||||
if (m_buffer==NULL) {
|
||||
return appl::Buffer::Iterator();
|
||||
}
|
||||
@@ -347,7 +347,7 @@ namespace appl {
|
||||
* @brief Get an Iterator on the start selection.
|
||||
* @return The Iterator
|
||||
*/
|
||||
appl::Buffer::Iterator selectStart(void) {
|
||||
appl::Buffer::Iterator selectStart() {
|
||||
if (m_buffer==NULL) {
|
||||
return appl::Buffer::Iterator();
|
||||
}
|
||||
@@ -357,7 +357,7 @@ namespace appl {
|
||||
* @brief Get an Iterator on the stop selection.
|
||||
* @return The Iterator
|
||||
*/
|
||||
appl::Buffer::Iterator selectStop(void) {
|
||||
appl::Buffer::Iterator selectStop() {
|
||||
if (m_buffer==NULL) {
|
||||
return appl::Buffer::Iterator();
|
||||
}
|
||||
|
@@ -17,7 +17,7 @@
|
||||
#undef __class__
|
||||
#define __class__ "ViewerManager"
|
||||
|
||||
appl::ViewerManager::ViewerManager(void) :
|
||||
appl::ViewerManager::ViewerManager() :
|
||||
ewol::Resource("???ViewerManager???"),
|
||||
m_viewer(NULL) {
|
||||
addObjectType("appl::ViewerManager");
|
||||
@@ -25,7 +25,7 @@ appl::ViewerManager::ViewerManager(void) :
|
||||
m_bufferManager = appl::BufferManager::keep();
|
||||
}
|
||||
|
||||
appl::ViewerManager::~ViewerManager(void) {
|
||||
appl::ViewerManager::~ViewerManager() {
|
||||
appl::BufferManager::release(m_bufferManager);
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ void appl::ViewerManager::onObjectRemove(ewol::Object* _removeObject) {
|
||||
}
|
||||
}
|
||||
|
||||
appl::ViewerManager* appl::ViewerManager::keep(void) {
|
||||
appl::ViewerManager* appl::ViewerManager::keep() {
|
||||
//EWOL_INFO("KEEP : appl::GlyphPainting : file : \"" << _filename << "\"");
|
||||
appl::ViewerManager* object = static_cast<appl::ViewerManager*>(getManager().localKeep("???ViewerManager???"));
|
||||
if (NULL != object) {
|
||||
|
@@ -19,8 +19,8 @@ namespace appl {
|
||||
class TextViewer;
|
||||
class ViewerManager : public ewol::Resource {
|
||||
protected:
|
||||
ViewerManager(void);
|
||||
~ViewerManager(void);
|
||||
ViewerManager();
|
||||
~ViewerManager();
|
||||
private:
|
||||
appl::BufferManager* m_bufferManager; //!< handle on the buffer manager
|
||||
appl::TextViewer* m_viewer;
|
||||
@@ -34,7 +34,7 @@ namespace appl {
|
||||
* @brief Get the current buffer selected
|
||||
* @return Pointer on the buffer selected
|
||||
*/
|
||||
appl::TextViewer* getViewerSelected(void) {
|
||||
appl::TextViewer* getViewerSelected() {
|
||||
return m_viewer;
|
||||
};
|
||||
/**
|
||||
@@ -55,7 +55,7 @@ namespace appl {
|
||||
* @param[in] _filename Name of the configuration file.
|
||||
* @return pointer on the resource or NULL if an error occured.
|
||||
*/
|
||||
static appl::ViewerManager* keep(void);
|
||||
static appl::ViewerManager* keep();
|
||||
/**
|
||||
* @brief release the keeped resources
|
||||
* @param[in,out] reference on the object pointer
|
||||
|
@@ -15,7 +15,7 @@
|
||||
|
||||
static const char* s_closeDone = "close-done";
|
||||
|
||||
appl::WorkerCloseAllFile::WorkerCloseAllFile(void) :
|
||||
appl::WorkerCloseAllFile::WorkerCloseAllFile() :
|
||||
m_worker(NULL),
|
||||
m_bufferManager(NULL) {
|
||||
addObjectType("appl::WorkerCloseAllFile");
|
||||
@@ -55,7 +55,7 @@ appl::WorkerCloseAllFile::WorkerCloseAllFile(void) :
|
||||
m_worker->registerOnEvent(this, appl::WorkerCloseFile::eventCloseDone, s_closeDone);
|
||||
}
|
||||
|
||||
appl::WorkerCloseAllFile::~WorkerCloseAllFile(void) {
|
||||
appl::WorkerCloseAllFile::~WorkerCloseAllFile() {
|
||||
appl::BufferManager::release(m_bufferManager);
|
||||
}
|
||||
|
||||
|
@@ -15,8 +15,8 @@
|
||||
namespace appl {
|
||||
class WorkerCloseAllFile : public ewol::Object {
|
||||
public:
|
||||
WorkerCloseAllFile(void);
|
||||
virtual ~WorkerCloseAllFile(void);
|
||||
WorkerCloseAllFile();
|
||||
virtual ~WorkerCloseAllFile();
|
||||
private:
|
||||
std::vector<std::string> m_bufferNameList;
|
||||
appl::WorkerCloseFile* m_worker; //! pop-up element that is open...
|
||||
|
@@ -96,7 +96,7 @@ appl::WorkerCloseFile::WorkerCloseFile(const std::string& _bufferName) :
|
||||
tmpWindows->popUpWidgetPush(tmpPopUp);
|
||||
}
|
||||
|
||||
appl::WorkerCloseFile::~WorkerCloseFile(void) {
|
||||
appl::WorkerCloseFile::~WorkerCloseFile() {
|
||||
appl::BufferManager::release(m_bufferManager);
|
||||
}
|
||||
|
||||
|
@@ -20,7 +20,7 @@ namespace appl {
|
||||
public:
|
||||
// note : if == "" ==> current ...
|
||||
WorkerCloseFile(const std::string& _bufferName);
|
||||
virtual ~WorkerCloseFile(void);
|
||||
virtual ~WorkerCloseFile();
|
||||
private:
|
||||
std::string m_bufferName;
|
||||
appl::Buffer* m_buffer; //!< reference on the buffer (when rename, we have no more reference on the buffer
|
||||
|
@@ -15,7 +15,7 @@
|
||||
|
||||
static const char* s_saveAsDone = "save-as-done";
|
||||
|
||||
appl::WorkerSaveAllFile::WorkerSaveAllFile(void) :
|
||||
appl::WorkerSaveAllFile::WorkerSaveAllFile() :
|
||||
m_worker(NULL),
|
||||
m_bufferManager(NULL) {
|
||||
addObjectType("appl::WorkerSaveAllFile");
|
||||
@@ -58,7 +58,7 @@ appl::WorkerSaveAllFile::WorkerSaveAllFile(void) :
|
||||
m_worker->registerOnEvent(this, appl::WorkerSaveFile::eventSaveDone, s_saveAsDone);
|
||||
}
|
||||
|
||||
appl::WorkerSaveAllFile::~WorkerSaveAllFile(void) {
|
||||
appl::WorkerSaveAllFile::~WorkerSaveAllFile() {
|
||||
appl::BufferManager::release(m_bufferManager);
|
||||
}
|
||||
|
||||
|
@@ -15,8 +15,8 @@
|
||||
namespace appl {
|
||||
class WorkerSaveAllFile : public ewol::Object {
|
||||
public:
|
||||
WorkerSaveAllFile(void);
|
||||
virtual ~WorkerSaveAllFile(void);
|
||||
WorkerSaveAllFile();
|
||||
virtual ~WorkerSaveAllFile();
|
||||
private:
|
||||
std::vector<std::string> m_bufferNameList;
|
||||
appl::WorkerSaveFile* m_worker; //! pop-up element that is open...
|
||||
|
@@ -81,7 +81,7 @@ appl::WorkerSaveFile::WorkerSaveFile(const std::string& _bufferName, bool _force
|
||||
m_chooser->registerOnEvent(this, ewol::widget::FileChooser::eventValidate, s_saveAsValidate);
|
||||
}
|
||||
|
||||
appl::WorkerSaveFile::~WorkerSaveFile(void) {
|
||||
appl::WorkerSaveFile::~WorkerSaveFile() {
|
||||
appl::BufferManager::release(m_bufferManager);
|
||||
}
|
||||
|
||||
|
@@ -18,7 +18,7 @@ namespace appl {
|
||||
static const char* eventSaveDone;
|
||||
public:
|
||||
WorkerSaveFile(const std::string& _bufferName, bool _forceSaveAs=true);
|
||||
virtual ~WorkerSaveFile(void);
|
||||
virtual ~WorkerSaveFile();
|
||||
private:
|
||||
std::string m_bufferName;
|
||||
ewol::widget::FileChooser* m_chooser; //! pop-up element that is open...
|
||||
|
Reference in New Issue
Block a user