[DEV] start new dev for Button

This commit is contained in:
Edouard DUPIN 2013-04-08 22:41:32 +02:00
parent 5256f55f1b
commit e3c7b75807
5 changed files with 54 additions and 38 deletions

View File

@ -58,6 +58,7 @@ MainWindows::MainWindows(void) :
return; return;
} }
m_sizerVert->SubWidgetAdd(mySizerHori); m_sizerVert->SubWidgetAdd(mySizerHori);
/*
myButton = new widget::Button("default theme (cube)"); myButton = new widget::Button("default theme (cube)");
if (NULL != myButton) { if (NULL != myButton) {
myButton->SetToggleMode(true); myButton->SetToggleMode(true);
@ -75,6 +76,7 @@ MainWindows::MainWindows(void) :
myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventChangeWidgetNext); myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventChangeWidgetNext);
mySizerHori->SubWidgetAdd(myButton); mySizerHori->SubWidgetAdd(myButton);
} }
*/
widget::Spacer* mySpacer = new widget::Spacer(); widget::Spacer* mySpacer = new widget::Spacer();
if (NULL != mySpacer) { if (NULL != mySpacer) {
mySpacer->SetExpendX(false); mySpacer->SetExpendX(false);
@ -125,7 +127,7 @@ void MainWindows::OnReceiveMessage(ewol::EObject * CallerObject, const char * ev
} }
// special init forcing ... // special init forcing ...
if(CallerObject == NULL) { if(CallerObject == NULL) {
m_idWidget = 4; m_idWidget = 1;
} }
switch(m_idWidget) switch(m_idWidget)
{ {

View File

@ -52,20 +52,23 @@ TestButton::TestButton(void) :
return; return;
} }
SubWidgetAdd(mySizerHori); SubWidgetAdd(mySizerHori);
myButton = new widget::Button("Expend X <br/> (false)"); myButton = new widget::Button();
if (NULL != myButton) { if (NULL != myButton) {
myButton->SetToggleMode(true); myButton->SetToggleMode(true);
myButton->SetLabelToggle("Expend X <br/> (true)"); myButton->SetSubWidget(new widget::Label("Expend X <br/> (false)"));
myButton->SetSubWidget(new widget::Label("Expend X <br/> (true)"), true);
myButton->RegisterOnEvent(this, ewolEventButtonValue, l_eventChangeExpendX); myButton->RegisterOnEvent(this, ewolEventButtonValue, l_eventChangeExpendX);
mySizerHori->SubWidgetAdd(myButton); mySizerHori->SubWidgetAdd(myButton);
} }
myButton = new widget::Button("Expend Y <br/> (false)"); myButton = new widget::Button();
if (NULL != myButton) { if (NULL != myButton) {
myButton->SetToggleMode(true); myButton->SetToggleMode(true);
myButton->SetLabelToggle("Expend Y <br/> (true)"); myButton->SetSubWidget(new widget::Label("Expend Y <br/> (false)"));
myButton->SetSubWidget(new widget::Label("Expend Y <br/> (true)"), true);
myButton->RegisterOnEvent(this, ewolEventButtonValue, l_eventChangeExpendY); myButton->RegisterOnEvent(this, ewolEventButtonValue, l_eventChangeExpendY);
mySizerHori->SubWidgetAdd(myButton); mySizerHori->SubWidgetAdd(myButton);
} }
/*
myButton = new widget::Button("Toggle<br/>(false)"); myButton = new widget::Button("Toggle<br/>(false)");
if (NULL != myButton) { if (NULL != myButton) {
myButton->SetToggleMode(true); myButton->SetToggleMode(true);
@ -80,6 +83,7 @@ TestButton::TestButton(void) :
myButton->RegisterOnEvent(this, ewolEventButtonValue, l_eventChangeTextToggle); myButton->RegisterOnEvent(this, ewolEventButtonValue, l_eventChangeTextToggle);
mySizerHori->SubWidgetAdd(myButton); mySizerHori->SubWidgetAdd(myButton);
} }
*/
mySizerHori = new widget::Sizer(widget::Sizer::modeHori); mySizerHori = new widget::Sizer(widget::Sizer::modeHori);
if (NULL == mySizerHori) { if (NULL == mySizerHori) {
@ -87,20 +91,24 @@ TestButton::TestButton(void) :
return; return;
} }
SubWidgetAdd(mySizerHori); SubWidgetAdd(mySizerHori);
myButton = new widget::Button("Fill X (false)");
myButton = new widget::Button();
if (NULL != myButton) { if (NULL != myButton) {
myButton->SetToggleMode(true); myButton->SetToggleMode(true);
myButton->SetLabelToggle("Fill X (true)"); myButton->SetSubWidget(new widget::Label("Fill Y <br/> (false)"));
myButton->SetSubWidget(new widget::Label("Fill Y <br/> (true)"), true);
myButton->RegisterOnEvent(this, ewolEventButtonValue, l_eventChangeFillX); myButton->RegisterOnEvent(this, ewolEventButtonValue, l_eventChangeFillX);
mySizerHori->SubWidgetAdd(myButton); mySizerHori->SubWidgetAdd(myButton);
} }
myButton = new widget::Button("Fill Y (false)"); myButton = new widget::Button();
if (NULL != myButton) { if (NULL != myButton) {
myButton->SetToggleMode(true); myButton->SetToggleMode(true);
myButton->SetLabelToggle("Fill Y (true)"); myButton->SetSubWidget(new widget::Label("Fill Y <br/> (false)"));
myButton->SetSubWidget(new widget::Label("Fill Y <br/> (true)"), true);
myButton->RegisterOnEvent(this, ewolEventButtonValue, l_eventChangeFillY); myButton->RegisterOnEvent(this, ewolEventButtonValue, l_eventChangeFillY);
mySizerHori->SubWidgetAdd(myButton); mySizerHori->SubWidgetAdd(myButton);
} }
/*
myButton = new widget::Button("Image (false)"); myButton = new widget::Button("Image (false)");
if (NULL != myButton) { if (NULL != myButton) {
myButton->SetToggleMode(true); myButton->SetToggleMode(true);
@ -120,6 +128,7 @@ TestButton::TestButton(void) :
myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventChangeText); myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventChangeText);
mySizerHori->SubWidgetAdd(myButton); mySizerHori->SubWidgetAdd(myButton);
} }
*/
widget::Spacer* mySpacer = new widget::Spacer(); widget::Spacer* mySpacer = new widget::Spacer();
if (NULL != mySpacer) { if (NULL != mySpacer) {
mySpacer->SetExpendX(false); mySpacer->SetExpendX(false);
@ -149,8 +158,9 @@ TestButton::TestButton(void) :
mySizerHori->SubWidgetAdd(mySpacer); mySizerHori->SubWidgetAdd(mySpacer);
} }
m_testWidget = new widget::Button("My <font color=\"#FF0000\">Button</font> <br/> And Some under line<br/> plop <br/> and an other super long line ..."); m_testWidget = new widget::Button();
if (NULL != m_testWidget) { if (NULL != m_testWidget) {
m_testWidget->SetSubWidget(new widget::Label("My <font color=\"#FF0000\">Button</font> <br/> And Some under line<br/> plop <br/> and an other super long line ..."));
m_testWidget->SetExpendX(false); m_testWidget->SetExpendX(false);
m_testWidget->SetExpendY(false); m_testWidget->SetExpendY(false);
m_testWidget->SetFillX(false); m_testWidget->SetFillX(false);
@ -246,26 +256,26 @@ void TestButton::OnReceiveMessage(ewol::EObject * CallerObject, const char * eve
} else if (eventId == l_eventChangeTextToggle) { } else if (eventId == l_eventChangeTextToggle) {
if (NULL!=m_testWidget) { if (NULL!=m_testWidget) {
if (data=="1") { if (data=="1") {
m_testWidget->SetLabelToggle("A stupid very long text on toggle <br/><br/> and on multiple lines"); //m_testWidget->SetLabelToggle("A stupid very long text on toggle <br/><br/> and on multiple lines");
} else { } else {
m_testWidget->SetLabelToggle(""); //m_testWidget->SetLabelToggle("");
} }
} }
} else if (eventId == l_eventChangeImage) { } else if (eventId == l_eventChangeImage) {
if (NULL!=m_testWidget) { if (NULL!=m_testWidget) {
if (data=="1") { if (data=="1") {
m_testWidget->SetImage("THEME:GUI:icon.png"); //m_testWidget->SetImage("THEME:GUI:icon.png");
m_testWidget->SetImageSize(50); //m_testWidget->SetImageSize(50);
} else { } else {
m_testWidget->SetImage(""); //m_testWidget->SetImage("");
} }
} }
} else if (eventId == l_eventChangeImageToggle) { } else if (eventId == l_eventChangeImageToggle) {
if (NULL!=m_testWidget) { if (NULL!=m_testWidget) {
if (data=="1") { if (data=="1") {
m_testWidget->SetImageToggle("THEME:GUI:icon.png"); //m_testWidget->SetImageToggle("THEME:GUI:icon.png");
} else { } else {
m_testWidget->SetImageToggle(""); //m_testWidget->SetImageToggle("");
} }
} }
} else if (eventId == l_eventChangeText) { } else if (eventId == l_eventChangeText) {
@ -274,34 +284,34 @@ void TestButton::OnReceiveMessage(ewol::EObject * CallerObject, const char * eve
switch (countTextID%10) switch (countTextID%10)
{ {
case 0: case 0:
m_testWidget->SetLabel("simple Text"); //m_testWidget->SetLabel("simple Text");
break; break;
case 1: case 1:
m_testWidget->SetLabel("<left>Align Left</left>"); //m_testWidget->SetLabel("<left>Align Left</left>");
break; break;
case 2: case 2:
m_testWidget->SetLabel("<right>Align right</right>"); //m_testWidget->SetLabel("<right>Align right</right>");
break; break;
case 3: case 3:
m_testWidget->SetLabel("simple Text<br/> With Some Other Lines<br/> and more if you want ...<br/> plop"); //m_testWidget->SetLabel("simple Text<br/> With Some Other Lines<br/> and more if you want ...<br/> plop");
break; break;
case 4: case 4:
m_testWidget->SetLabel("simple <bold>Text</bold> with bold"); //m_testWidget->SetLabel("simple <bold>Text</bold> with bold");
break; break;
case 5: case 5:
m_testWidget->SetLabel("simple <italic>Text</italic> with italic"); //m_testWidget->SetLabel("simple <italic>Text</italic> with italic");
break; break;
case 6: case 6:
m_testWidget->SetLabel("simple <italic><bold>Text</bold></italic> with italic bold"); //m_testWidget->SetLabel("simple <italic><bold>Text</bold></italic> with italic bold");
break; break;
case 7: case 7:
m_testWidget->SetLabel(""); //m_testWidget->SetLabel("");
break; break;
case 8: case 8:
m_testWidget->SetLabel("simple <font color=\"#FFFF0088\">Text</font> with colored text"); //m_testWidget->SetLabel("simple <font color=\"#FFFF0088\">Text</font> with colored text");
break; break;
default: default:
m_testWidget->SetLabel("My <font color=\"#FF0000\">Button</font> <br/> And Some under line<br/> plop <br/> and an other super long line ..."); //m_testWidget->SetLabel("My <font color=\"#FF0000\">Button</font> <br/> And Some under line<br/> plop <br/> and an other super long line ...");
break; break;
} }
countTextID++; countTextID++;

View File

@ -47,6 +47,7 @@ TestButtonColor::TestButtonColor(void) :
return; return;
} }
SubWidgetAdd(mySizerHori); SubWidgetAdd(mySizerHori);
/*
myButton = new widget::Button("Expend X (false)"); myButton = new widget::Button("Expend X (false)");
if (NULL != myButton) { if (NULL != myButton) {
myButton->SetToggleMode(true); myButton->SetToggleMode(true);
@ -75,6 +76,7 @@ TestButtonColor::TestButtonColor(void) :
myButton->RegisterOnEvent(this, ewolEventButtonValue, l_eventChangeFillY); myButton->RegisterOnEvent(this, ewolEventButtonValue, l_eventChangeFillY);
mySizerHori->SubWidgetAdd(myButton); mySizerHori->SubWidgetAdd(myButton);
} }
*/
widget::Spacer* mySpacer = new widget::Spacer(); widget::Spacer* mySpacer = new widget::Spacer();
if (NULL != mySpacer) { if (NULL != mySpacer) {
@ -104,7 +106,7 @@ TestButtonColor::TestButtonColor(void) :
mySpacer->SetColor(0x00FF0080); mySpacer->SetColor(0x00FF0080);
mySizerHori->SubWidgetAdd(mySpacer); mySizerHori->SubWidgetAdd(mySpacer);
} }
/*
m_testWidget = new widget::ButtonColor(draw::color::olive); m_testWidget = new widget::ButtonColor(draw::color::olive);
if (NULL != m_testWidget) { if (NULL != m_testWidget) {
m_testWidget->SetExpendX(false); m_testWidget->SetExpendX(false);
@ -114,7 +116,7 @@ TestButtonColor::TestButtonColor(void) :
m_testWidget->RegisterOnEvent(this, ewolEventButtonColorChange); m_testWidget->RegisterOnEvent(this, ewolEventButtonColorChange);
mySizerHori->SubWidgetAdd(m_testWidget); mySizerHori->SubWidgetAdd(m_testWidget);
} }
*/
mySpacer = new widget::Spacer(); mySpacer = new widget::Spacer();
if (NULL != mySpacer) { if (NULL != mySpacer) {
mySpacer->SetExpendX(false); mySpacer->SetExpendX(false);
@ -156,33 +158,33 @@ void TestButtonColor::OnReceiveMessage(ewol::EObject * CallerObject, const char
if (eventId == l_eventChangeExpendX) { if (eventId == l_eventChangeExpendX) {
if (NULL!=m_testWidget) { if (NULL!=m_testWidget) {
if (data=="1") { if (data=="1") {
m_testWidget->SetExpendX(true); //m_testWidget->SetExpendX(true);
} else { } else {
m_testWidget->SetExpendX(false); //m_testWidget->SetExpendX(false);
} }
} }
} else if (eventId == l_eventChangeExpendY) { } else if (eventId == l_eventChangeExpendY) {
if (NULL!=m_testWidget) { if (NULL!=m_testWidget) {
if (data=="1") { if (data=="1") {
m_testWidget->SetExpendY(true); //m_testWidget->SetExpendY(true);
} else { } else {
m_testWidget->SetExpendY(false); //m_testWidget->SetExpendY(false);
} }
} }
} else if (eventId == l_eventChangeFillX) { } else if (eventId == l_eventChangeFillX) {
if (NULL!=m_testWidget) { if (NULL!=m_testWidget) {
if (data=="1") { if (data=="1") {
m_testWidget->SetFillX(true); //m_testWidget->SetFillX(true);
} else { } else {
m_testWidget->SetFillX(false); //m_testWidget->SetFillX(false);
} }
} }
} else if (eventId == l_eventChangeFillY) { } else if (eventId == l_eventChangeFillY) {
if (NULL!=m_testWidget) { if (NULL!=m_testWidget) {
if (data=="1") { if (data=="1") {
m_testWidget->SetFillY(true); //m_testWidget->SetFillY(true);
} else { } else {
m_testWidget->SetFillY(false); //m_testWidget->SetFillY(false);
} }
} }
} }

View File

@ -50,6 +50,7 @@ TestLabel::TestLabel(void) :
return; return;
} }
SubWidgetAdd(mySizerHori); SubWidgetAdd(mySizerHori);
/*
myButton = new widget::Button("Expend X (false)"); myButton = new widget::Button("Expend X (false)");
if (NULL != myButton) { if (NULL != myButton) {
myButton->SetToggleMode(true); myButton->SetToggleMode(true);
@ -90,6 +91,7 @@ TestLabel::TestLabel(void) :
myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventChangeLabel); myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventChangeLabel);
mySizerHori->SubWidgetAdd(myButton); mySizerHori->SubWidgetAdd(myButton);
} }
*/
widget::Spacer* mySpacer = new widget::Spacer(); widget::Spacer* mySpacer = new widget::Spacer();
if (NULL != mySpacer) { if (NULL != mySpacer) {

View File

@ -124,7 +124,7 @@ void APP_Init(void)
// create the specific windows // create the specific windows
ewol::WindowsSet(basicWindows); ewol::WindowsSet(basicWindows);
tmpTestOfTheFSNode(); //tmpTestOfTheFSNode();
// add files // add files