diff --git a/sources/appl/MainWindows.cpp b/sources/appl/MainWindows.cpp
index 89d322f..d99f223 100644
--- a/sources/appl/MainWindows.cpp
+++ b/sources/appl/MainWindows.cpp
@@ -58,6 +58,7 @@ MainWindows::MainWindows(void) :
return;
}
m_sizerVert->SubWidgetAdd(mySizerHori);
+ /*
myButton = new widget::Button("default theme (cube)");
if (NULL != myButton) {
myButton->SetToggleMode(true);
@@ -75,6 +76,7 @@ MainWindows::MainWindows(void) :
myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventChangeWidgetNext);
mySizerHori->SubWidgetAdd(myButton);
}
+ */
widget::Spacer* mySpacer = new widget::Spacer();
if (NULL != mySpacer) {
mySpacer->SetExpendX(false);
@@ -125,7 +127,7 @@ void MainWindows::OnReceiveMessage(ewol::EObject * CallerObject, const char * ev
}
// special init forcing ...
if(CallerObject == NULL) {
- m_idWidget = 4;
+ m_idWidget = 1;
}
switch(m_idWidget)
{
diff --git a/sources/appl/TestButton.cpp b/sources/appl/TestButton.cpp
index b617269..ab5ee5b 100644
--- a/sources/appl/TestButton.cpp
+++ b/sources/appl/TestButton.cpp
@@ -52,20 +52,23 @@ TestButton::TestButton(void) :
return;
}
SubWidgetAdd(mySizerHori);
- myButton = new widget::Button("Expend X
(false)");
+ myButton = new widget::Button();
if (NULL != myButton) {
myButton->SetToggleMode(true);
- myButton->SetLabelToggle("Expend X
(true)");
+ myButton->SetSubWidget(new widget::Label("Expend X
(false)"));
+ myButton->SetSubWidget(new widget::Label("Expend X
(true)"), true);
myButton->RegisterOnEvent(this, ewolEventButtonValue, l_eventChangeExpendX);
mySizerHori->SubWidgetAdd(myButton);
}
- myButton = new widget::Button("Expend Y
(false)");
+ myButton = new widget::Button();
if (NULL != myButton) {
myButton->SetToggleMode(true);
- myButton->SetLabelToggle("Expend Y
(true)");
+ myButton->SetSubWidget(new widget::Label("Expend Y
(false)"));
+ myButton->SetSubWidget(new widget::Label("Expend Y
(true)"), true);
myButton->RegisterOnEvent(this, ewolEventButtonValue, l_eventChangeExpendY);
mySizerHori->SubWidgetAdd(myButton);
}
+ /*
myButton = new widget::Button("Toggle
(false)");
if (NULL != myButton) {
myButton->SetToggleMode(true);
@@ -80,6 +83,7 @@ TestButton::TestButton(void) :
myButton->RegisterOnEvent(this, ewolEventButtonValue, l_eventChangeTextToggle);
mySizerHori->SubWidgetAdd(myButton);
}
+ */
mySizerHori = new widget::Sizer(widget::Sizer::modeHori);
if (NULL == mySizerHori) {
@@ -87,20 +91,24 @@ TestButton::TestButton(void) :
return;
}
SubWidgetAdd(mySizerHori);
- myButton = new widget::Button("Fill X (false)");
+
+ myButton = new widget::Button();
if (NULL != myButton) {
myButton->SetToggleMode(true);
- myButton->SetLabelToggle("Fill X (true)");
+ myButton->SetSubWidget(new widget::Label("Fill Y
(false)"));
+ myButton->SetSubWidget(new widget::Label("Fill Y
(true)"), true);
myButton->RegisterOnEvent(this, ewolEventButtonValue, l_eventChangeFillX);
mySizerHori->SubWidgetAdd(myButton);
}
- myButton = new widget::Button("Fill Y (false)");
+ myButton = new widget::Button();
if (NULL != myButton) {
myButton->SetToggleMode(true);
- myButton->SetLabelToggle("Fill Y (true)");
+ myButton->SetSubWidget(new widget::Label("Fill Y
(false)"));
+ myButton->SetSubWidget(new widget::Label("Fill Y
(true)"), true);
myButton->RegisterOnEvent(this, ewolEventButtonValue, l_eventChangeFillY);
mySizerHori->SubWidgetAdd(myButton);
}
+ /*
myButton = new widget::Button("Image (false)");
if (NULL != myButton) {
myButton->SetToggleMode(true);
@@ -120,6 +128,7 @@ TestButton::TestButton(void) :
myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventChangeText);
mySizerHori->SubWidgetAdd(myButton);
}
+ */
widget::Spacer* mySpacer = new widget::Spacer();
if (NULL != mySpacer) {
mySpacer->SetExpendX(false);
@@ -149,8 +158,9 @@ TestButton::TestButton(void) :
mySizerHori->SubWidgetAdd(mySpacer);
}
- m_testWidget = new widget::Button("My Button
And Some under line
plop
and an other super long line ...");
+ m_testWidget = new widget::Button();
if (NULL != m_testWidget) {
+ m_testWidget->SetSubWidget(new widget::Label("My Button
And Some under line
plop
and an other super long line ..."));
m_testWidget->SetExpendX(false);
m_testWidget->SetExpendY(false);
m_testWidget->SetFillX(false);
@@ -246,26 +256,26 @@ void TestButton::OnReceiveMessage(ewol::EObject * CallerObject, const char * eve
} else if (eventId == l_eventChangeTextToggle) {
if (NULL!=m_testWidget) {
if (data=="1") {
- m_testWidget->SetLabelToggle("A stupid very long text on toggle
and on multiple lines");
+ //m_testWidget->SetLabelToggle("A stupid very long text on toggle
and on multiple lines");
} else {
- m_testWidget->SetLabelToggle("");
+ //m_testWidget->SetLabelToggle("");
}
}
} else if (eventId == l_eventChangeImage) {
if (NULL!=m_testWidget) {
if (data=="1") {
- m_testWidget->SetImage("THEME:GUI:icon.png");
- m_testWidget->SetImageSize(50);
+ //m_testWidget->SetImage("THEME:GUI:icon.png");
+ //m_testWidget->SetImageSize(50);
} else {
- m_testWidget->SetImage("");
+ //m_testWidget->SetImage("");
}
}
} else if (eventId == l_eventChangeImageToggle) {
if (NULL!=m_testWidget) {
if (data=="1") {
- m_testWidget->SetImageToggle("THEME:GUI:icon.png");
+ //m_testWidget->SetImageToggle("THEME:GUI:icon.png");
} else {
- m_testWidget->SetImageToggle("");
+ //m_testWidget->SetImageToggle("");
}
}
} else if (eventId == l_eventChangeText) {
@@ -274,34 +284,34 @@ void TestButton::OnReceiveMessage(ewol::EObject * CallerObject, const char * eve
switch (countTextID%10)
{
case 0:
- m_testWidget->SetLabel("simple Text");
+ //m_testWidget->SetLabel("simple Text");
break;
case 1:
- m_testWidget->SetLabel("Align Left");
+ //m_testWidget->SetLabel("Align Left");
break;
case 2:
- m_testWidget->SetLabel("Align right");
+ //m_testWidget->SetLabel("Align right");
break;
case 3:
- m_testWidget->SetLabel("simple Text
With Some Other Lines
and more if you want ...
plop");
+ //m_testWidget->SetLabel("simple Text
With Some Other Lines
and more if you want ...
plop");
break;
case 4:
- m_testWidget->SetLabel("simple Text with bold");
+ //m_testWidget->SetLabel("simple Text with bold");
break;
case 5:
- m_testWidget->SetLabel("simple Text with italic");
+ //m_testWidget->SetLabel("simple Text with italic");
break;
case 6:
- m_testWidget->SetLabel("simple Text with italic bold");
+ //m_testWidget->SetLabel("simple Text with italic bold");
break;
case 7:
- m_testWidget->SetLabel("");
+ //m_testWidget->SetLabel("");
break;
case 8:
- m_testWidget->SetLabel("simple Text with colored text");
+ //m_testWidget->SetLabel("simple Text with colored text");
break;
default:
- m_testWidget->SetLabel("My Button
And Some under line
plop
and an other super long line ...");
+ //m_testWidget->SetLabel("My Button
And Some under line
plop
and an other super long line ...");
break;
}
countTextID++;
diff --git a/sources/appl/TestButtonColor.cpp b/sources/appl/TestButtonColor.cpp
index 106f8a4..32bf4c6 100644
--- a/sources/appl/TestButtonColor.cpp
+++ b/sources/appl/TestButtonColor.cpp
@@ -47,6 +47,7 @@ TestButtonColor::TestButtonColor(void) :
return;
}
SubWidgetAdd(mySizerHori);
+ /*
myButton = new widget::Button("Expend X (false)");
if (NULL != myButton) {
myButton->SetToggleMode(true);
@@ -75,6 +76,7 @@ TestButtonColor::TestButtonColor(void) :
myButton->RegisterOnEvent(this, ewolEventButtonValue, l_eventChangeFillY);
mySizerHori->SubWidgetAdd(myButton);
}
+ */
widget::Spacer* mySpacer = new widget::Spacer();
if (NULL != mySpacer) {
@@ -104,7 +106,7 @@ TestButtonColor::TestButtonColor(void) :
mySpacer->SetColor(0x00FF0080);
mySizerHori->SubWidgetAdd(mySpacer);
}
-
+ /*
m_testWidget = new widget::ButtonColor(draw::color::olive);
if (NULL != m_testWidget) {
m_testWidget->SetExpendX(false);
@@ -114,7 +116,7 @@ TestButtonColor::TestButtonColor(void) :
m_testWidget->RegisterOnEvent(this, ewolEventButtonColorChange);
mySizerHori->SubWidgetAdd(m_testWidget);
}
-
+ */
mySpacer = new widget::Spacer();
if (NULL != mySpacer) {
mySpacer->SetExpendX(false);
@@ -156,33 +158,33 @@ void TestButtonColor::OnReceiveMessage(ewol::EObject * CallerObject, const char
if (eventId == l_eventChangeExpendX) {
if (NULL!=m_testWidget) {
if (data=="1") {
- m_testWidget->SetExpendX(true);
+ //m_testWidget->SetExpendX(true);
} else {
- m_testWidget->SetExpendX(false);
+ //m_testWidget->SetExpendX(false);
}
}
} else if (eventId == l_eventChangeExpendY) {
if (NULL!=m_testWidget) {
if (data=="1") {
- m_testWidget->SetExpendY(true);
+ //m_testWidget->SetExpendY(true);
} else {
- m_testWidget->SetExpendY(false);
+ //m_testWidget->SetExpendY(false);
}
}
} else if (eventId == l_eventChangeFillX) {
if (NULL!=m_testWidget) {
if (data=="1") {
- m_testWidget->SetFillX(true);
+ //m_testWidget->SetFillX(true);
} else {
- m_testWidget->SetFillX(false);
+ //m_testWidget->SetFillX(false);
}
}
} else if (eventId == l_eventChangeFillY) {
if (NULL!=m_testWidget) {
if (data=="1") {
- m_testWidget->SetFillY(true);
+ //m_testWidget->SetFillY(true);
} else {
- m_testWidget->SetFillY(false);
+ //m_testWidget->SetFillY(false);
}
}
}
diff --git a/sources/appl/TestLabel.cpp b/sources/appl/TestLabel.cpp
index 023973a..4da0d2b 100644
--- a/sources/appl/TestLabel.cpp
+++ b/sources/appl/TestLabel.cpp
@@ -50,6 +50,7 @@ TestLabel::TestLabel(void) :
return;
}
SubWidgetAdd(mySizerHori);
+ /*
myButton = new widget::Button("Expend X (false)");
if (NULL != myButton) {
myButton->SetToggleMode(true);
@@ -90,6 +91,7 @@ TestLabel::TestLabel(void) :
myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventChangeLabel);
mySizerHori->SubWidgetAdd(myButton);
}
+ */
widget::Spacer* mySpacer = new widget::Spacer();
if (NULL != mySpacer) {
diff --git a/sources/appl/init.cpp b/sources/appl/init.cpp
index 2d422fe..66f40a3 100644
--- a/sources/appl/init.cpp
+++ b/sources/appl/init.cpp
@@ -124,7 +124,7 @@ void APP_Init(void)
// create the specific windows
ewol::WindowsSet(basicWindows);
- tmpTestOfTheFSNode();
+ //tmpTestOfTheFSNode();
// add files