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

[DEV] work better than previously but this is the start of rework

Browse Source
This commit is contained in:
Edouard DUPIN 2013-04-14 13:58:59 +02:00
parent aabc92f309
commit af417b44f0
2 changed files with 112 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,21 +14,22 @@
#include "appl/globalMsg.h" #include "appl/globalMsg.h"
#include <ewol/widget/Button.h> #include <ewol/widget/Button.h>
#include <ewol/widget/Image.h>
#undef __class__ #undef __class__
#define __class__ "Search" #define __class__ "Search"
const char* const l_eventSearchEntry = "appl-search-entry"; const char* const l_eventSearchEntry = "appl-search-entry";
const char* const l_eventSearchEntryEnter = "appl-search-entry-enter"; const char* const l_eventSearchEntryEnter = "appl-search-entry-enter";
const char* const l_eventReplaceEntry = "appl-replace-entry"; const char* const l_eventReplaceEntry = "appl-replace-entry";
const char* const l_eventReplaceEntryEnter = "appl-replace-entry-enter"; const char* const l_eventReplaceEntryEnter = "appl-replace-entry-enter";
const char* const l_eventSearchBt = "appl-search-button"; const char* const l_eventSearchBt = "appl-search-button";
const char* const l_eventReplaceBt = "appl-replace-button"; const char* const l_eventReplaceBt = "appl-replace-button";
const char* const l_eventCaseCb = "appl-case-sensitive-CheckBox"; const char* const l_eventCaseCb = "appl-case-sensitive-CheckBox";
const char* const l_eventWrapCb = "appl-wrap-CheckBox"; const char* const l_eventWrapCb = "appl-wrap-CheckBox";
const char* const l_eventForwardCb = "appl-forward-CheckBox"; const char* const l_eventForwardCb = "appl-forward-CheckBox";
const char* const l_eventHideBt = "appl-hide-button"; const char* const l_eventHideBt = "appl-hide-button";
Search::Search(void) : Search::Search(void) :
widget::Sizer(widget::Sizer::modeHori), widget::Sizer(widget::Sizer::modeHori),
@ -36,14 +37,44 @@ Search::Search(void) :
m_replaceEntry(NULL) m_replaceEntry(NULL)
{ {
m_forward = false; m_forward = false;
// TODO : Change the mode of creating interface :
/*
<composer>
<sizer mode="hori" expand="true,false" fill="true" lock="true">
<button name="SEARCH:close">
<image src="THEME:GUI:Remove.svg" fill="true" size="70,70mm"/>
</button>
<entry name="SEARCH:search-entry" expand="true" fill="true"/>
<button name="SEARCH:search">
<image src="THEME:GUI:Search.svg" fill="true" size="70,70mm"/>
</button>
<entry name="SEARCH:replace-entry" expand="true" fill="true"/>
<button name="SEARCH:replace">
<image src="THEME:GUI:Replace.svg" fill="true" size="70,70mm"/>
</button>
<button name="SEARCH:case">
<image src="THEME:GUI:CaseSensitive.svg" fill="true" size="70,70mm" hover="Close search bar"/>
<image src="THEME:GUI:CaseSensitive.svg" fill="true" size="70,70mm" hover="Close search bar"/>
</button>
<button name="SEARCH:wrap">
<image src="THEME:GUI:WrapAround.svg" fill="true" size="70,70mm" hover="Close search bar"/>
<image src="THEME:GUI:WrapAround.svg" fill="true" size="70,70mm" hover="Close search bar"/>
</button>
<button name="SEARCH:up-down">
<image src="THEME:GUI:Up.svg" fill="true" size="70,70mm" hover="Close search bar"/>
<image src="THEME:GUI:Down.svg" fill="true" size="70,70mm" hover="Close search bar"/>
</button>
</size>
</composer>
*/
widget::Button * myButtonImage = NULL; widget::Button * myButtonImage = NULL;
myButtonImage = new widget::Button(""); myButtonImage = new widget::Button();
if (NULL == myButtonImage) { if (NULL == myButtonImage) {
APPL_ERROR("Widget allocation error ==> it will missing in the display"); APPL_ERROR("Widget allocation error ==> it will missing in the display");
} else { } else {
myButtonImage->SetImage("THEME:GUI:Remove.svg"); widget::Image* tmpImage = new widget::Image("THEME:GUI:Remove.svg");
myButtonImage->SetMinSize(32,32); tmpImage->SetImageSize(ewol::Dimension(vec2(8,8), ewol::Dimension::Millimeter));
myButtonImage->SetSubWidget(tmpImage);
myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventHideBt); myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventHideBt);
SubWidgetAdd(myButtonImage); SubWidgetAdd(myButtonImage);
} }
@ -54,17 +85,18 @@ Search::Search(void) :
} else { } else {
m_searchEntry->RegisterOnEvent(this, ewolEventEntryModify, l_eventSearchEntry); m_searchEntry->RegisterOnEvent(this, ewolEventEntryModify, l_eventSearchEntry);
m_searchEntry->RegisterOnEvent(this, ewolEventEntryEnter, l_eventSearchEntryEnter); m_searchEntry->RegisterOnEvent(this, ewolEventEntryEnter, l_eventSearchEntryEnter);
m_searchEntry->SetExpendX(true); m_searchEntry->SetExpand(bvec2(true,false));
m_searchEntry->SetFillX(true); m_searchEntry->SetFill(bvec2(true,false));
SubWidgetAdd(m_searchEntry); SubWidgetAdd(m_searchEntry);
} }
myButtonImage = new widget::Button(""); myButtonImage = new widget::Button();
if (NULL == myButtonImage) { if (NULL == myButtonImage) {
APPL_ERROR("Widget allocation error ==> it will missing in the display"); APPL_ERROR("Widget allocation error ==> it will missing in the display");
} else { } else {
myButtonImage->SetImage("THEME:GUI:Search.svg"); widget::Image* tmpImage = new widget::Image("THEME:GUI:Search.svg");
myButtonImage->SetMinSize(32,32); tmpImage->SetImageSize(ewol::Dimension(vec2(8,8), ewol::Dimension::Millimeter));
myButtonImage->SetSubWidget(tmpImage);
myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventSearchBt); myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventSearchBt);
SubWidgetAdd(myButtonImage); SubWidgetAdd(myButtonImage);
} }
@ -75,55 +107,74 @@ Search::Search(void) :
} else { } else {
m_replaceEntry->RegisterOnEvent(this, ewolEventEntryModify, l_eventReplaceEntry); m_replaceEntry->RegisterOnEvent(this, ewolEventEntryModify, l_eventReplaceEntry);
m_replaceEntry->RegisterOnEvent(this, ewolEventEntryEnter, l_eventReplaceEntryEnter); m_replaceEntry->RegisterOnEvent(this, ewolEventEntryEnter, l_eventReplaceEntryEnter);
m_replaceEntry->SetExpendX(true); m_replaceEntry->SetExpand(bvec2(true,false));
m_replaceEntry->SetFillX(true); m_replaceEntry->SetFill(bvec2(true,false));
SubWidgetAdd(m_replaceEntry); SubWidgetAdd(m_replaceEntry);
} }
myButtonImage = new widget::Button(""); myButtonImage = new widget::Button();
if (NULL == myButtonImage) { if (NULL == myButtonImage) {
APPL_ERROR("Widget allocation error ==> it will missing in the display"); APPL_ERROR("Widget allocation error ==> it will missing in the display");
} else { } else {
myButtonImage->SetImage("THEME:GUI:Replace.svg"); widget::Image* tmpImage = new widget::Image("THEME:GUI:Replace.svg");
myButtonImage->SetMinSize(32,32); tmpImage->SetImageSize(ewol::Dimension(vec2(8,8), ewol::Dimension::Millimeter));
myButtonImage->SetSubWidget(tmpImage);
myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventReplaceBt); myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventReplaceBt);
SubWidgetAdd(myButtonImage); SubWidgetAdd(myButtonImage);
} }
myButtonImage = new widget::Button(""); myButtonImage = new widget::Button();
if (NULL == myButtonImage) { if (NULL == myButtonImage) {
APPL_ERROR("Widget allocation error ==> it will missing in the display"); APPL_ERROR("Widget allocation error ==> it will missing in the display");
} else { } else {
myButtonImage->SetImage("THEME:GUI:CaseSensitive.svg");
myButtonImage->SetImageToggle("THEME:GUI:CaseSensitive.svg", 0xFFFFFF5F);
myButtonImage->SetMinSize(32,32);
myButtonImage->SetToggleMode(true); myButtonImage->SetToggleMode(true);
widget::Image* tmpImage = new widget::Image("THEME:GUI:CaseSensitive.svg");
tmpImage->SetImageSize(ewol::Dimension(vec2(8,8), ewol::Dimension::Millimeter));
myButtonImage->SetSubWidget(tmpImage);
tmpImage = new widget::Image("THEME:GUI:CaseSensitive.svg"); // TODO : Set color on Image .... 0xFFFFFF5F
tmpImage->SetImageSize(ewol::Dimension(vec2(8,8), ewol::Dimension::Millimeter));
myButtonImage->SetSubWidgetToggle(tmpImage);
myButtonImage->SetValue(!SearchData::GetCase()); myButtonImage->SetValue(!SearchData::GetCase());
myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventCaseCb); myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventCaseCb);
SubWidgetAdd(myButtonImage); SubWidgetAdd(myButtonImage);
} }
myButtonImage = new widget::Button(""); myButtonImage = new widget::Button();
if (NULL == myButtonImage) { if (NULL == myButtonImage) {
APPL_ERROR("Widget allocation error ==> it will missing in the display"); APPL_ERROR("Widget allocation error ==> it will missing in the display");
} else { } else {
myButtonImage->SetImage("THEME:GUI:WrapAround.svg");
myButtonImage->SetImageToggle("THEME:GUI:WrapAround.svg", 0xFFFFFF5F);
myButtonImage->SetMinSize(32,32);
myButtonImage->SetToggleMode(true); myButtonImage->SetToggleMode(true);
widget::Image* tmpImage = new widget::Image("THEME:GUI:WrapAround.svg");
tmpImage->SetImageSize(ewol::Dimension(vec2(8,8), ewol::Dimension::Millimeter));
myButtonImage->SetSubWidget(tmpImage);
tmpImage = new widget::Image("THEME:GUI:WrapAround.svg"); // TODO : Set color on Image .... 0xFFFFFF5F
tmpImage->SetImageSize(ewol::Dimension(vec2(8,8), ewol::Dimension::Millimeter));
myButtonImage->SetSubWidgetToggle(tmpImage);
myButtonImage->SetValue(!SearchData::GetWrap()); myButtonImage->SetValue(!SearchData::GetWrap());
myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventWrapCb); myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventWrapCb);
SubWidgetAdd(myButtonImage); SubWidgetAdd(myButtonImage);
} }
myButtonImage = new widget::Button(""); myButtonImage = new widget::Button();
if (NULL == myButtonImage) { if (NULL == myButtonImage) {
APPL_ERROR("Widget allocation error ==> it will missing in the display"); APPL_ERROR("Widget allocation error ==> it will missing in the display");
} else { } else {
myButtonImage->SetImage("THEME:GUI:Up.svg");
myButtonImage->SetImageToggle("THEME:GUI:Down.svg");
myButtonImage->SetMinSize(32,32);
myButtonImage->SetToggleMode(true); myButtonImage->SetToggleMode(true);
widget::Image* tmpImage = new widget::Image("THEME:GUI:Up.svg");
tmpImage->SetImageSize(ewol::Dimension(vec2(8,8), ewol::Dimension::Millimeter));
myButtonImage->SetSubWidget(tmpImage);
tmpImage = new widget::Image("THEME:GUI:Down.svg");
tmpImage->SetImageSize(ewol::Dimension(vec2(8,8), ewol::Dimension::Millimeter));
myButtonImage->SetSubWidgetToggle(tmpImage);
myButtonImage->SetValue(!m_forward); myButtonImage->SetValue(!m_forward);
myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventForwardCb); myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventForwardCb);
SubWidgetAdd(myButtonImage); SubWidgetAdd(myButtonImage);

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

@ -16,6 +16,7 @@
#include <etk/tool.h> #include <etk/tool.h>
#include <ewol/widget/Button.h> #include <ewol/widget/Button.h>
#include <ewol/widget/Label.h> #include <ewol/widget/Label.h>
#include <ewol/widget/Composer.h>
#include <ewol/ewol.h> #include <ewol/ewol.h>
@ -53,7 +54,7 @@ appl::TagFileSelection::TagFileSelection(void)
if (NULL == mySizerVert) { if (NULL == mySizerVert) {
EWOL_ERROR("Can not allocate widget ==> display might be in error"); EWOL_ERROR("Can not allocate widget ==> display might be in error");
} else { } else {
mySizerVert->LockExpendContamination(true); mySizerVert->LockExpand(bvec2(true,true));
// set it in the pop-up-system : // set it in the pop-up-system :
SubWidgetSet(mySizerVert); SubWidgetSet(mySizerVert);
@ -66,22 +67,37 @@ appl::TagFileSelection::TagFileSelection(void)
if (NULL == mySpacer) { if (NULL == mySpacer) {
EWOL_ERROR("Can not allocate widget ==> display might be in error"); EWOL_ERROR("Can not allocate widget ==> display might be in error");
} else { } else {
mySpacer->SetExpendX(true); mySpacer->SetExpand(bvec2(true,false));
mySizerHori->SubWidgetAdd(mySpacer); mySizerHori->SubWidgetAdd(mySpacer);
} }
myWidgetValidate = new widget::Button("Jump"); myWidgetValidate = new widget::Button();
if (NULL == myWidgetValidate) { if (NULL == myWidgetValidate) {
EWOL_ERROR("Can not allocate widget ==> display might be in error"); EWOL_ERROR("Can not allocate widget ==> display might be in error");
} else { } else {
myWidgetValidate->SetImage("icon/Load.svg"); myWidgetValidate->SetSubWidget(
new widget::Composer(widget::Composer::String,
"<composer>\n"
" <sizer mode=\"hori\">\n"
" <image src=\"THEME:GUI:icon/Load.svg\" fill=\"true\" size=\"70,70mm\"/>\n"
" <label>Jump</label>\n"
" </sizer>\n"
"</composer\n"));
myWidgetValidate->RegisterOnEvent(this, ewolEventButtonPressed, applEventctagsSelection); myWidgetValidate->RegisterOnEvent(this, ewolEventButtonPressed, applEventctagsSelection);
mySizerHori->SubWidgetAdd(myWidgetValidate); mySizerHori->SubWidgetAdd(myWidgetValidate);
} }
myWidgetCancel = new widget::Button("Cancel"); myWidgetCancel = new widget::Button();
if (NULL == myWidgetCancel) { if (NULL == myWidgetCancel) {
EWOL_ERROR("Can not allocate widget ==> display might be in error"); EWOL_ERROR("Can not allocate widget ==> display might be in error");
} else { } else {
myWidgetCancel->SetImage("icon/Remove.svg"); myWidgetCancel->SetSubWidget(
new widget::Composer(widget::Composer::String,
"<composer>\n"
" <sizer mode=\"hori\">\n"
" <image src=\"THEME:GUI:icon/Remove.svg\" fill=\"true\" size=\"70,70mm\"/>\n"
" <label>Cancel</label>\n"
" </sizer>\n"
"</composer\n"));
myWidgetCancel->RegisterOnEvent(this, ewolEventButtonPressed, applEventctagsCancel); myWidgetCancel->RegisterOnEvent(this, ewolEventButtonPressed, applEventctagsCancel);
mySizerHori->SubWidgetAdd(myWidgetCancel); mySizerHori->SubWidgetAdd(myWidgetCancel);
} }
@ -93,10 +109,8 @@ appl::TagFileSelection::TagFileSelection(void)
m_listTag->RegisterOnEvent(this, applEventCtagsListValidate); m_listTag->RegisterOnEvent(this, applEventCtagsListValidate);
m_listTag->RegisterOnEvent(this, applEventCtagsListSelect); m_listTag->RegisterOnEvent(this, applEventCtagsListSelect);
m_listTag->RegisterOnEvent(this, applEventCtagsListUnSelect); m_listTag->RegisterOnEvent(this, applEventCtagsListUnSelect);
m_listTag->SetExpendX(true); m_listTag->SetExpand(bvec2(true,true));
m_listTag->SetExpendY(true); m_listTag->SetFill(bvec2(true,true));
m_listTag->SetFillX(true);
m_listTag->SetFillY(true);
mySizerVert->SubWidgetAdd(m_listTag); mySizerVert->SubWidgetAdd(m_listTag);
} }