diff --git a/assets/icon/CaseSensitive.svg b/assets/icon/CaseSensitive.svg
new file mode 100644
index 0000000..5ef3f6c
--- /dev/null
+++ b/assets/icon/CaseSensitive.svg
@@ -0,0 +1,13 @@
+
diff --git a/assets/lang_java.xml b/assets/lang_java.xml
index 977909f..61d6570 100644
--- a/assets/lang_java.xml
+++ b/assets/lang_java.xml
@@ -45,23 +45,23 @@
keyword
- \@return|goto|if|else|case|default|switch|break|continue|while|do|for|sizeof\@
+ \@return|goto|if|else|case|default|switch|break|continue|while|do|for\@
systemFunction
- \@new|delete|try|catch|memset|fopen|fread|fwrite|fgets|fclose|printf|(f|s|diag_)printf|calloc|malloc|realloc|(cyg|sup)_([a-z]|[A-Z]|[0-9]|_)+\@
+ \@new|try|catch|print\@
type
- \@bool|char|double|float|u?int(8|16|32|64|128)?(_t)?|long|short|signed|size_t|unsigned|void|(I|U)(8|16|32|64|128)\@
+ \@boolean|byte|char|double|float|int|long|short|String|Object|Thread|void|enum\@
storageKeyword
- \@import|package|extends|Override|const|class|virtual|private|public|protected|friend|const|extern|auto|register|static|unsigned|signed|volatile|char|double|float|int|long|short|void|typedef|struct|union|enum\@
+ \@import|package|extends|Override|implements|const|class|abstract|private|public|protected|final|const|static|transiant|volatile|interface@
commonDefine
- \@NULL|MAX|MIN|__LINE__|__DATA__|__FILE__|__func__|__TIME__|__STDC__\@
+ \@null\@
number
@@ -69,7 +69,7 @@
boolean
- \@true|TRUE|false|FALSE\@
+ \@true|false\@
macro
diff --git a/jni/appl/Gui/Search.cpp b/jni/appl/Gui/Search.cpp
index b8f4b8b..c03fbe1 100644
--- a/jni/appl/Gui/Search.cpp
+++ b/jni/appl/Gui/Search.cpp
@@ -32,6 +32,7 @@
#include "appl/globalMsg.h"
#include
+#include
#include
#include
#include
@@ -69,6 +70,7 @@ Search::Search(void)
ewol::Entry * myEntry = NULL;
ewol::Button * myButton = NULL;
ewol::CheckBox * mycheckbox = NULL;
+ ewol::ButtonImage * myButtonImage = NULL;
myEntry = new ewol::Entry();
myEntry->RegisterOnEvent(this, ewolEventEntryModify, l_eventSearchEntry);
@@ -76,27 +78,33 @@ Search::Search(void)
myEntry->SetFillX(true);
SubWidgetAdd(myEntry);
+ myButtonImage = new ewol::ButtonImage("icon/Search.svg");
+ myButtonImage->SetMinSize(32,32);
+ myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventSearchBt);
+ SubWidgetAdd(myButtonImage);
+
myEntry = new ewol::Entry();
myEntry->RegisterOnEvent(this, ewolEventEntryModify, l_eventReplaceEntry);
myEntry->SetExpendX(true);
myEntry->SetFillX(true);
SubWidgetAdd(myEntry);
- myButton = new ewol::Button("Search");
- myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventSearchBt);
- SubWidgetAdd(myButton);
+ myButtonImage = new ewol::ButtonImage("icon/Replace.svg");
+ myButtonImage->SetMinSize(32,32);
+ myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventReplaceBt);
+ SubWidgetAdd(myButtonImage);
- myButton = new ewol::Button("Replace");
- myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventReplaceBt);
- SubWidgetAdd(myButton);
+ myButtonImage = new ewol::ButtonImage("icon/CaseSensitive.svg");
+ myButtonImage->SetMinSize(32,32);
+ myButtonImage->SetToggleMode(true);
+ myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventCaseCb);
+ SubWidgetAdd(myButtonImage);
- mycheckbox = new ewol::CheckBox("Aa");
- mycheckbox->RegisterOnEvent(this, ewolEventCheckBoxClicked, l_eventCaseCb);
- SubWidgetAdd(mycheckbox);
-
- mycheckbox = new ewol::CheckBox("Wrap");
- mycheckbox->RegisterOnEvent(this, ewolEventCheckBoxClicked, l_eventWrapCb);
- SubWidgetAdd(mycheckbox);
+ myButtonImage = new ewol::ButtonImage("icon/WrapAround.svg");
+ myButtonImage->SetMinSize(32,32);
+ myButtonImage->SetToggleMode(true);
+ myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventWrapCb);
+ SubWidgetAdd(myButtonImage);
mycheckbox = new ewol::CheckBox("Forward");
mycheckbox->RegisterOnEvent(this, ewolEventCheckBoxClicked, l_eventForwardCb);